diff options
| author | jessib <jessib@riseup.net> | 2012-10-08 10:52:20 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2012-10-08 10:52:20 -0700 |
| commit | f77301824c42bdd4559a0b0e58b8f3c26f239643 (patch) | |
| tree | c815c1c82e4350e12e6ee38d00b979812fa840c2 /Gemfile.lock | |
| parent | c4220a167f883f31c408b55cd970761faeb53aa5 (diff) | |
| parent | e264e7354788c0b7eff7bb296eed9c59304cc8b8 (diff) | |
Merge remote branch 'origin/release-0.1.0' into help_develop
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 3f30e62..e9994f9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,17 +14,6 @@ PATH rails (~> 3.2.8) PATH - remote: help - specs: - leap_web_help (0.0.1) - bootstrap-sass (~> 2.0.4) - haml (~> 3.1.7) - jquery-rails - leap_web_core (~> 0.0.1) - rails (~> 3.2.8) - simple_form - -PATH remote: users specs: leap_web_users (0.0.1) @@ -34,7 +23,7 @@ PATH jquery-rails leap_web_core (~> 0.0.1) rails (~> 3.2.8) - ruby-srp (~> 0.1.0) + ruby-srp (~> 0.1.1) simple_form GEM @@ -106,6 +95,7 @@ GEM railties (>= 3.1.0, < 5.0) thor (~> 0.14) json (1.7.5) + libv8 (3.3.10.4) linecache (0.46) rbx-require-relative (> 0.0.4) mail (2.4.4) @@ -151,7 +141,7 @@ GEM ruby-debug-base (~> 0.10.4.0) ruby-debug-base (0.10.4) linecache (>= 0.3) - ruby-srp (0.1.0) + ruby-srp (0.1.1) sass (3.2.1) sass-rails (3.2.5) railties (~> 3.2.0) @@ -164,6 +154,8 @@ GEM hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + therubyracer (0.10.2) + libv8 (~> 3.3.10) thor (0.16.0) tilt (1.3.3) treetop (1.4.10) @@ -187,11 +179,11 @@ DEPENDENCIES json leap_web_certs! leap_web_core! - leap_web_help! leap_web_users! mocha rails (= 3.2.8) ruby-debug sass-rails (~> 3.2.5) simple_form + therubyracer uglifier (>= 1.2.7) |