diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-20 07:28:20 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-20 07:28:20 +0000 |
| commit | 521840a4943dce96d467768754076a4fbe51fa0d (patch) | |
| tree | 7becab07b23352bf697bc5b555b5de797fa640d5 /Gemfile.lock | |
| parent | 569c207e74cf7a5ae833c72e527dbbca10eccb74 (diff) | |
| parent | ddef09f07f155f621a0a809a456d650b6a770023 (diff) | |
| download | gitlab-ce-521840a4943dce96d467768754076a4fbe51fa0d.tar.gz | |
Merge branch 'cs-update-rainbow' into 'master'
Update rainbow from 2.1.0 to 2.2.2.
See merge request !12289
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a4c95bdedcb..e38f8b92c8c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -651,7 +651,8 @@ GEM activesupport (= 4.2.8) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.1.0) + rainbow (2.2.2) + rake raindrops (0.17.0) rake (10.5.0) rblineprof (0.3.6) @@ -1053,7 +1054,7 @@ DEPENDENCIES rack-proxy (~> 0.6.0) rails (= 4.2.8) rails-deprecated_sanitizer (~> 1.0.3) - rainbow (~> 2.1.0) + rainbow (~> 2.2) rblineprof (~> 0.3.6) rdoc (~> 4.2) recaptcha (~> 3.0) |