diff options
| author | Luc Donnet | 2018-02-09 15:04:58 +0100 |
|---|---|---|
| committer | Luc Donnet | 2018-02-09 15:04:58 +0100 |
| commit | 7b62e86c4d5cc878fd9178d2296c3f5498bcd1cb (patch) | |
| tree | e97abcf575f059463fda54f15dba045f08467402 /Gemfile.lock | |
| parent | 8147a3bd838aaaa959c3f488c1bc9016a5401645 (diff) | |
| parent | a68053c85fdb55e43fdf1ae7d9aba95e31a148bb (diff) | |
| download | chouette-core-7b62e86c4d5cc878fd9178d2296c3f5498bcd1cb.tar.bz2 | |
Merge branch 'master' into 4126-add-i18n-js
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a6f54f9cb..046167e69 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -269,7 +269,7 @@ GEM htmlbeautifier (1.3.1) httparty (0.14.0) multi_xml (>= 0.5.2) - i18n (0.9.3) + i18n (0.9.4) concurrent-ruby (~> 1.0) i18n-js (3.0.4) i18n (~> 0.6, >= 0.6.6) @@ -320,7 +320,7 @@ GEM mime-types-data (3.2016.0521) mimemagic (0.3.2) mini_portile2 (2.3.0) - minitest (5.11.2) + minitest (5.11.3) money (6.10.1) i18n (>= 0.6.4, < 1.0) multi_json (1.12.1) @@ -449,6 +449,10 @@ GEM roo (2.7.1) nokogiri (~> 1) rubyzip (~> 1.1, < 2.0.0) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) @@ -465,6 +469,8 @@ GEM rspec-expectations (~> 3.5.0) rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) + rspec-snapshot (0.1.1) + rspec (> 3.0.0) rspec-support (3.5.0) ruby-filemagic (0.7.2) ruby-graphviz (1.2.3) @@ -555,7 +561,7 @@ GEM json (>= 1.8, < 3.0) parser (>= 2.3.0.7) rainbow (>= 1.99.1, < 3.0) - tzinfo (1.2.4) + tzinfo (1.2.5) thread_safe (~> 0.1) uglifier (2.7.2) execjs (>= 0.3.0) @@ -568,7 +574,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - webpacker (3.0.2) + webpacker (3.2.1) activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) @@ -684,6 +690,7 @@ DEPENDENCIES rgeo (~> 0.5.2) roo rspec-rails (~> 3.5.0) + rspec-snapshot rubyzip sass-rails (~> 4.0.3) sawyer (~> 0.6.0) @@ -706,7 +713,7 @@ DEPENDENCIES transpec uglifier (~> 2.7.2) webmock - webpacker (= 3.0.2) + webpacker (= 3.2.1) whenever! will_paginate will_paginate-bootstrap |