diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-24 10:13:35 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-24 10:13:35 +0000 |
| commit | 79e7024017822a4f59f17f4c697bc2acdf259095 (patch) | |
| tree | f93a4e8746132b08986a13ac03d2b63a6c476306 | |
| parent | e9a098ee45f5e758c1cde9152c6ad6cff38ad080 (diff) | |
| parent | dc5e3c0bf27f99021a4c11cfe07be27c9c017094 (diff) | |
| download | gitlab-ce-79e7024017822a4f59f17f4c697bc2acdf259095.tar.gz | |
Merge branch 'sh-bump-sanitize-4.6.6' into 'master'
Bump nokogiri to 1.8.4 and sanitize to 4.6.6 for performance
See merge request gitlab-org/gitlab-ce!20795
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | Gemfile.rails5.lock | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-bump-sanitize-4-6-6.yml | 5 |
4 files changed, 10 insertions, 5 deletions
@@ -233,7 +233,7 @@ gem 'ruby-fogbugz', '~> 0.2.1' gem 'kubeclient', '~> 3.1.0' # Sanitize user input -gem 'sanitize', '~> 4.6.5' +gem 'sanitize', '~> 4.6' gem 'babosa', '~> 1.0.2' # Sanitizes SVG input diff --git a/Gemfile.lock b/Gemfile.lock index 0976169bb11..22626c0071b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -514,7 +514,7 @@ GEM net-ldap (0.16.0) net-ssh (5.0.1) netrc (0.11.0) - nokogiri (1.8.3) + nokogiri (1.8.4) mini_portile2 (~> 2.3.0) nokogumbo (1.5.0) nokogiri @@ -808,7 +808,7 @@ GEM et-orbi (~> 1.0) rugged (0.27.2) safe_yaml (1.0.4) - sanitize (4.6.5) + sanitize (4.6.6) crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4) @@ -1157,7 +1157,7 @@ DEPENDENCIES ruby_parser (~> 3.8) rufus-scheduler (~> 3.4) rugged (~> 0.27) - sanitize (~> 4.6.5) + sanitize (~> 4.6) sass-rails (~> 5.0.6) scss_lint (~> 0.56.0) seed-fu (~> 2.3.7) diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index 1cf612fd4a6..5a0aaf05608 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -1168,7 +1168,7 @@ DEPENDENCIES ruby_parser (~> 3.8) rufus-scheduler (~> 3.4) rugged (~> 0.27) - sanitize (~> 4.6.5) + sanitize (~> 4.6) sass-rails (~> 5.0.6) scss_lint (~> 0.56.0) seed-fu (~> 2.3.7) diff --git a/changelogs/unreleased/sh-bump-sanitize-4-6-6.yml b/changelogs/unreleased/sh-bump-sanitize-4-6-6.yml new file mode 100644 index 00000000000..b9444440cb9 --- /dev/null +++ b/changelogs/unreleased/sh-bump-sanitize-4-6-6.yml @@ -0,0 +1,5 @@ +--- +title: Bump nokogiri to 1.8.4 and sanitize to 4.6.6 for performance +merge_request: 20795 +author: +type: performance |