diff options
| author | Alban Peignier | 2017-08-31 10:37:01 +0200 |
|---|---|---|
| committer | Alban Peignier | 2017-08-31 10:37:14 +0200 |
| commit | 09ffc0b637fc8c40cea6dfbd1d2976ff2ea8c823 (patch) | |
| tree | e728ffed052c90b7d3264e2753080e435a737f9d /Gemfile.lock | |
| parent | 26c4b71042d258da2fc9ccd67855219b9b012c6b (diff) | |
| download | chouette-core-09ffc0b637fc8c40cea6dfbd1d2976ff2ea8c823.tar.bz2 | |
Remove squeel and update ransack (to fix dependency problem with squeel). Refs #4364
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d03a26d18..1e2ac3cf8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,15 +22,6 @@ GIT nokogiri (~> 1.6) GIT - remote: https://github.com/activerecord-hackery/squeel.git - revision: 5542266d502db8022e14105f9dfb455a79d6fc4a - specs: - squeel (1.2.3) - activerecord (>= 3.0) - activesupport (>= 3.0) - polyamorous (~> 1.1.0) - -GIT remote: https://github.com/af83/language_engine.git revision: c4d7d5af781b55c1df4806c3960caf3c22f1ee96 specs: @@ -313,7 +304,7 @@ GEM mime-types-data (3.2016.0521) mimemagic (0.3.2) mini_portile2 (2.2.0) - minitest (5.10.2) + minitest (5.10.3) multi_json (1.12.1) multi_test (0.1.2) multi_xml (0.6.0) @@ -338,7 +329,7 @@ GEM capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - polyamorous (1.1.0) + polyamorous (1.3.1) activerecord (>= 3.0) polylines (0.3.0) pry (0.10.4) @@ -356,7 +347,7 @@ GEM railties (>= 3.1, < 5.0) rabl (0.13.1) activesupport (>= 2.3.14) - rack (1.6.5) + rack (1.6.8) rack-protection (1.5.3) rack rack-test (0.6.3) @@ -409,12 +400,12 @@ GEM rainbow (2.2.2) rake rake (12.0.0) - ransack (1.6.5) + ransack (1.8.3) actionpack (>= 3.0) activerecord (>= 3.0) activesupport (>= 3.0) i18n - polyamorous (~> 1.1) + polyamorous (~> 1.3) rb-fsevent (0.9.8) rb-inotify (0.9.8) ffi (>= 0.5.0) @@ -667,7 +658,6 @@ DEPENDENCIES spring spring-commands-rspec sqlite3 - squeel! teaspoon-jasmine therubyracer (~> 0.12) timecop @@ -679,4 +669,4 @@ DEPENDENCIES will_paginate-bootstrap BUNDLED WITH - 1.14.6 + 1.15.4 |