diff options
| author | jessib <jessib@riseup.net> | 2012-10-08 11:05:17 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2012-10-08 11:05:17 -0700 |
| commit | 8f100d3c03a6f554e703c5d0b2fe221958424c26 (patch) | |
| tree | 77e90f53d05fecefa91adf89a3c35f19e277996b /Gemfile.lock | |
| parent | f77301824c42bdd4559a0b0e58b8f3c26f239643 (diff) | |
| parent | f5aea5347601c3500bb3670971d44995c35c3c7b (diff) | |
Merge branch 'release-0.1.0' into help_develop
Conflicts:
.gitignore
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e9994f9..f23e74e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,27 +1,27 @@ PATH remote: certs specs: - leap_web_certs (0.0.4) - leap_web_core (~> 0.0.1) + leap_web_certs (0.1.0) + leap_web_core (= 0.1.0) rails (~> 3.2.8) PATH remote: core specs: - leap_web_core (0.0.1) + leap_web_core (0.1.0) couchrest (~> 1.1.3) couchrest_model (~> 2.0.0.beta2) + couchrest_session_store (~> 0.0.1) rails (~> 3.2.8) PATH remote: users specs: - leap_web_users (0.0.1) + leap_web_users (0.1.0) bootstrap-sass (~> 2.0.4) - couchrest_session_store (~> 0.0.1) haml (~> 3.1.7) jquery-rails - leap_web_core (~> 0.0.1) + leap_web_core (= 0.1.0) rails (~> 3.2.8) ruby-srp (~> 0.1.1) simple_form @@ -57,8 +57,8 @@ GEM i18n (~> 0.6) multi_json (~> 1.0) arel (3.0.2) - bootstrap-sass (2.0.4.0) - builder (3.0.0) + bootstrap-sass (2.0.4.2) + builder (3.0.3) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) @@ -83,15 +83,15 @@ GEM execjs (1.4.0) multi_json (~> 1.0) haml (3.1.7) - haml-rails (0.3.4) - actionpack (~> 3.0) - activesupport (~> 3.0) - haml (~> 3.0) - railties (~> 3.0) + haml-rails (0.3.5) + actionpack (>= 3.1, < 4.1) + activesupport (>= 3.1, < 4.1) + haml (~> 3.1) + railties (>= 3.1, < 4.1) hike (1.2.1) - i18n (0.6.0) + i18n (0.6.1) journey (1.0.4) - jquery-rails (2.1.1) + jquery-rails (2.1.3) railties (>= 3.1.0, < 5.0) thor (~> 0.14) json (1.7.5) @@ -104,7 +104,7 @@ GEM treetop (~> 1.4.8) metaclass (0.0.1) mime-types (1.19) - mocha (0.12.4) + mocha (0.12.6) metaclass (~> 0.0.1) multi_json (1.3.6) polyglot (0.3.3) @@ -113,7 +113,7 @@ GEM rack (>= 0.4) rack-ssl (1.3.2) rack - rack-test (0.6.1) + rack-test (0.6.2) rack (>= 1.0) rails (3.2.8) actionmailer (= 3.2.8) @@ -147,7 +147,7 @@ GEM railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - simple_form (2.0.2) + simple_form (2.0.3) actionpack (~> 3.0) activemodel (~> 3.0) sprockets (2.1.3) @@ -162,9 +162,9 @@ GEM polyglot polyglot (>= 0.3.1) tzinfo (0.3.33) - uglifier (1.2.7) + uglifier (1.3.0) execjs (>= 0.3.0) - multi_json (~> 1.3) + multi_json (~> 1.0, >= 1.0.2) PLATFORMS ruby |