diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-25 09:02:06 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-25 09:02:06 +0000 |
| commit | 3fd885fd91ced331a3dd0bdf0d8068969e6c3a78 (patch) | |
| tree | 1131fa8b99ab8da1074c91d87518d3e3696cec42 /Gemfile.lock | |
| parent | 85d537ac737eeb4a1d2c7b8585d0b86c86feb408 (diff) | |
| parent | ec002e802677a691d758ebc6f94f23020b2b063a (diff) | |
| download | gitlab-ce-3fd885fd91ced331a3dd0bdf0d8068969e6c3a78.tar.gz | |
Merge branch 'rs-update-colorize' into 'master'
Bump colorize to ~> 0.7.0
Also removes `colored` which came in during the CI merge and is
redundant.
Closes #2822
See merge request !1895
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8466e86492e..46247dd88e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -123,8 +123,7 @@ GEM coffee-script-source execjs coffee-script-source (1.9.1.1) - colored (1.2) - colorize (0.5.8) + colorize (0.7.7) connection_pool (2.2.0) coveralls (0.8.2) json (~> 1.8) @@ -815,8 +814,7 @@ DEPENDENCIES carrierwave (~> 0.9.0) charlock_holmes (~> 0.7.3) coffee-rails (~> 4.1.0) - colored (~> 1.2) - colorize (~> 0.5.8) + colorize (~> 0.7.0) coveralls (~> 0.8.2) creole (~> 0.5.0) d3_rails (~> 3.5.5) |