diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-06-22 16:49:18 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-25 12:57:32 +0100 |
| commit | 28aa8a31dc9adf32684557edfcfc173a2155ac82 (patch) | |
| tree | 12a88967f20dd417406d9d3cf865ded2aafa423e | |
| parent | 06301e42fb7f90d5e7d7cc9ded1418c4df560387 (diff) | |
| download | gitlab-ce-28aa8a31dc9adf32684557edfcfc173a2155ac82.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 5f8d1a8fa68..f2f3a88e4f6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -869,7 +869,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) |