diff options
| author | elijah <elijah@riseup.net> | 2015-09-22 12:03:38 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2015-09-22 12:03:38 -0700 |
| commit | ea71f09ee23dbc080dd29adf2c3b8fa61f848c22 (patch) | |
| tree | 419db918544e034481608b5ac5bbd65b115f6355 /Gemfile.lock | |
| parent | 3e8771097ab7392560fdf07a85c011c23098fd1e (diff) | |
| parent | bdefeafe150123b7f186dda13366e7a1d7dc53ed (diff) | |
Merge branch 'bugfix/find_by_nil' of https://github.com/azul/leap_web into develop
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a185562..42dea53 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -77,7 +77,7 @@ GEM mime-types (~> 1.15) multi_json (~> 1.0) rest-client (~> 1.6.1) - couchrest_model (2.0.0) + couchrest_model (2.0.1) activemodel (>= 3.0) couchrest (~> 1.1.3) mime-types (>= 1.15) @@ -139,7 +139,7 @@ GEM jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.1) + json (1.8.3) kaminari (0.13.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -156,7 +156,7 @@ GEM minitest-stub-const (0.2) mocha (0.13.3) metaclass (~> 0.0.1) - multi_json (1.10.1) + multi_json (1.11.2) multi_test (0.1.1) nokogiri (1.6.5) mini_portile (~> 0.6.0) @@ -204,9 +204,8 @@ GEM rdoc (3.12.2) json (~> 1.4) ref (2.0.0) - rest-client (1.6.8) + rest-client (1.6.9) mime-types (~> 1.16) - rdoc (>= 2.4.2) ruby-srp (0.2.1) sass (3.4.9) sass-rails (3.2.6) @@ -239,7 +238,7 @@ GEM treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.42) + tzinfo (0.3.44) uglifier (1.2.7) execjs (>= 0.3.0) multi_json (~> 1.3) @@ -297,6 +296,3 @@ DEPENDENCIES thin uglifier (~> 1.2.7) valid_email - -BUNDLED WITH - 1.10.6 |