diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-06-22 16:49:18 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-06-22 16:49:18 +0000 |
| commit | 95842f230bbce6204d2ad547c7b2be1d73deeee9 (patch) | |
| tree | cccd22c289102d0cf3548dfd677e5d3a0b6a5301 | |
| parent | 643466f6b912c36130e3c287ce771cefd3bc4caf (diff) | |
| parent | fce42cbc8ac47285c24cc60de82d7a2dd25c1184 (diff) | |
| download | gitlab-ce-95842f230bbce6204d2ad547c7b2be1d73deeee9.tar.gz | |
Merge branch 'rs-update-sprockets' into 'master'
Bump sprockets to 3.7.2 to address CVE-2018-3760
See merge request gitlab-org/gitlab-ce!20109
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 3c619b2e534..fdc8f54e9c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -867,7 +867,7 @@ GEM activesupport (>= 4.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.1) |