summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2017-06-19 16:33:07 -0600
committerConnor Shea <connor.james.shea@gmail.com>2017-06-19 16:33:07 -0600
commitddef09f07f155f621a0a809a456d650b6a770023 (patch)
tree9075a32fc0f092cb1449bf44da383a251d5ece5c
parent025cbc2ad4dc175634676ff8a6955e043512d8bf (diff)
downloadgitlab-ce-ddef09f07f155f621a0a809a456d650b6a770023.tar.gz
Update rainbow from 2.1.0 to 2.2.2.cs-update-rainbow
Changelog: https://github.com/sickill/rainbow/blob/master/Changelog.md#222-2017-04-21 Adds support for Ruby 2.4.
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock7
2 files changed, 5 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 2c200f2fa7a..a450099552d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -158,7 +158,7 @@ gem 'rufus-scheduler', '~> 3.4'
gem 'httparty', '~> 0.13.3'
# Colored output to console
-gem 'rainbow', '~> 2.1.0'
+gem 'rainbow', '~> 2.2'
# GitLab settings
gem 'settingslogic', '~> 2.0.9'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6755c75e331..196eae512b5 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)
@@ -1119,4 +1120,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
- 1.15.0
+ 1.15.1