diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-07 20:13:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-07 20:13:07 +0200 |
| commit | f1c3053d36bec58e7b258384fd372c1e45252e1d (patch) | |
| tree | 2d72b2608e4bffe1f36039fa81b059ea75c0c656 /Gemfile.lock | |
| parent | 7cc78431092edb0996372bc93bbc398a34af2395 (diff) | |
| parent | 611740ce81486282dea650e2fbfa50baef58c1b3 (diff) | |
Merge pull request #768 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1f8243b8f..0efe99db0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -147,7 +147,6 @@ GEM cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) coderay (1.1.2) - colorize (0.8.1) concurrent-ruby (1.0.5) connection_pool (2.2.2) crack (0.4.3) @@ -676,7 +675,6 @@ DEPENDENCIES chewy (~> 5.0) cld3 (~> 3.2.0) climate_control (~> 0.2) - colorize derailed_benchmarks devise (~> 4.5) devise-two-factor (~> 3.0) @@ -749,7 +747,6 @@ DEPENDENCIES rspec-rails (~> 3.8) rspec-sidekiq (~> 3.0) rubocop (~> 0.59) - ruby-progressbar (~> 1.4) sanitize (~> 4.6) scss_lint (~> 0.57) sidekiq (~> 5.2) |