diff options
author | ThibG <thib@sitedethib.com> | 2019-06-05 13:28:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-05 13:28:05 +0200 |
commit | ff74aaca7cd532065f24829a3ac16de809bacf3f (patch) | |
tree | ba851bcad4bf9f657a0c2414ac3befdea9acea15 /Gemfile.lock | |
parent | 58946fef3c05342289c1c50132996fc4fd01cf68 (diff) | |
parent | 02b56c7e1a0fa561af9a85f765ec22eee3053561 (diff) |
Merge pull request #1093 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e45bcb5ff..be8ce27cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -231,7 +231,7 @@ GEM fugit (1.1.6) et-orbi (~> 1.1, >= 1.1.6) raabro (~> 1.1) - fuubar (2.3.2) + fuubar (2.4.0) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) get_process_mem (0.2.3) @@ -472,9 +472,6 @@ GEM thor (>= 0.19.0, < 2.0) rainbow (3.0.0) rake (12.3.2) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) - ffi (~> 1.0) rdf (3.0.9) hamster (~> 3.0) link_header (~> 0.0, >= 0.0.8) @@ -547,14 +544,6 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.8.0) nokogumbo (~> 2.0) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - scss_lint (0.58.0) - rake (>= 0.9, < 13) - sass (~> 3.5, >= 3.5.5) sidekiq (5.2.7) connection_pool (~> 2.2, >= 2.2.2) rack (>= 1.5.0) @@ -636,7 +625,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - webpacker (4.0.6) + webpacker (4.0.7) activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) @@ -689,7 +678,7 @@ DEPENDENCIES fastimage fog-core (<= 2.1.0) fog-openstack (~> 0.3) - fuubar (~> 2.3) + fuubar (~> 2.4) goldfinger (~> 2.1) hamlit-rails (~> 0.2) hiredis (~> 0.6) @@ -752,7 +741,6 @@ DEPENDENCIES rspec-sidekiq (~> 3.0) rubocop (~> 0.71) sanitize (~> 5.0) - scss_lint (~> 0.58) sidekiq (~> 5.2) sidekiq-bulk (~> 0.2.0) sidekiq-scheduler (~> 3.0) |