diff options
| author | jessib <jessib@riseup.net> | 2012-10-11 09:47:12 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2012-10-11 09:47:12 -0700 |
| commit | 336d5f786bbd1aaf1847007db64e55f96e585b9d (patch) | |
| tree | 0a18244ba8d21ed821c52edb2d44544b5358aa26 /Gemfile.lock | |
| parent | cf9ed38ab1840092352efdbb71bfeb5bc3b9f9d5 (diff) | |
| parent | 09003d3d2df7c250d3a0b55e83094e5e27094859 (diff) | |
Merge branch 'develop' into help_develop
Conflicts:
.gitignore
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f23e74e..fe49476 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,7 +3,6 @@ PATH specs: leap_web_certs (0.1.0) leap_web_core (= 0.1.0) - rails (~> 3.2.8) PATH remote: core @@ -12,22 +11,19 @@ PATH couchrest (~> 1.1.3) couchrest_model (~> 2.0.0.beta2) couchrest_session_store (~> 0.0.1) + json rails (~> 3.2.8) PATH remote: users specs: leap_web_users (0.1.0) - bootstrap-sass (~> 2.0.4) - haml (~> 3.1.7) - jquery-rails leap_web_core (= 0.1.0) - rails (~> 3.2.8) ruby-srp (~> 0.1.1) - simple_form GEM remote: https://rubygems.org/ + remote: http://rubygems.org/ specs: actionmailer (3.2.8) actionpack (= 3.2.8) @@ -147,7 +143,7 @@ GEM railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - simple_form (2.0.3) + simple_form (2.0.4) actionpack (~> 3.0) activemodel (~> 3.0) sprockets (2.1.3) @@ -162,9 +158,9 @@ GEM polyglot polyglot (>= 0.3.1) tzinfo (0.3.33) - uglifier (1.3.0) + uglifier (1.2.7) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) + multi_json (~> 1.3) PLATFORMS ruby @@ -172,18 +168,15 @@ PLATFORMS DEPENDENCIES bootstrap-sass (~> 2.0.4) coffee-rails (~> 3.2.2) - couchrest_session_store haml (~> 3.1.7) haml-rails (~> 0.3.4) jquery-rails - json leap_web_certs! leap_web_core! leap_web_users! mocha - rails (= 3.2.8) ruby-debug sass-rails (~> 3.2.5) simple_form therubyracer - uglifier (>= 1.2.7) + uglifier (~> 1.2.7) |