diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-04-04 08:42:17 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-04-04 08:42:17 +0000 |
| commit | 5d16fc677b87390e612b708b9c6a3c775591044d (patch) | |
| tree | 771e96ff89b18c6cd7b36529f0b6dcb54c1429a0 | |
| parent | 57b0636c57468b403fb1a78b87c9a642266c3c56 (diff) | |
| parent | 975c084c3eb0ee57376627cfa0cc29d9a1b1c5d5 (diff) | |
| download | gitlab-ce-5d16fc677b87390e612b708b9c6a3c775591044d.tar.gz | |
Merge branch 'blackst0ne-rails5-update-gemfile-rails5-lock' into 'master'
[Rails5] Update Gemfile.rails5.lock
See merge request gitlab-org/gitlab-ce!18164
| -rw-r--r-- | Gemfile.rails5.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index ca86861255b..08ae3fb514c 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -97,7 +97,7 @@ GEM autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) bootstrap_form (2.7.0) - brakeman (3.6.2) + brakeman (4.2.1) browser (2.5.3) builder (3.2.3) bullet (5.5.1) @@ -400,7 +400,7 @@ GEM hipchat (1.5.4) httparty mimemagic - html-pipeline (2.6.0) + html-pipeline (2.7.1) activesupport (>= 2) nokogiri (>= 1.4) html2text (0.2.1) @@ -1013,7 +1013,7 @@ DEPENDENCIES binding_of_caller (~> 0.7.2) bootstrap-sass (~> 3.3.0) bootstrap_form (~> 2.7.0) - brakeman (~> 3.6.0) + brakeman (~> 4.2) browser (~> 2.2) bullet (~> 5.5.0) bundler-audit (~> 0.5.0) @@ -1084,7 +1084,7 @@ DEPENDENCIES hashie-forbidden_attributes health_check (~> 2.6.0) hipchat (~> 1.5.0) - html-pipeline (~> 2.6.0) + html-pipeline (~> 2.7.1) html2text httparty (~> 0.13.3) influxdb (~> 0.2) |