diff options
author | Michael Kozono <mkozono@gmail.com> | 2018-08-15 07:27:59 +0000 |
---|---|---|
committer | James Lopez <james@gitlab.com> | 2018-08-15 07:27:59 +0000 |
commit | 2e8fe26b9bfedf7d65270c9874fcdcb62d58e741 (patch) | |
tree | a49f2e6533a2c277ec7a448bdd9ea58570405cad /Gemfile.lock | |
parent | 958ea287b5a2abe8a5ddaf9c6e01bea2d5de6590 (diff) | |
download | gitlab-ce-2e8fe26b9bfedf7d65270c9874fcdcb62d58e741.tar.gz |
Fix `bin/secpick` rainbow gem error, and security branch prefixing
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 62c3b28f386..b33dd75c278 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -691,8 +691,7 @@ GEM activesupport (= 4.2.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.2.2) - rake + rainbow (3.0.0) raindrops (0.18.0) rake (12.3.1) rb-fsevent (0.10.2) @@ -1134,7 +1133,7 @@ DEPENDENCIES rails (= 4.2.10) rails-deprecated_sanitizer (~> 1.0.3) rails-i18n (~> 4.0.9) - rainbow (~> 2.2) + rainbow (~> 3.0) raindrops (~> 0.18) rblineprof (~> 0.3.6) rbtrace (~> 0.4) |