diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-15 08:21:18 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-15 08:21:18 +0000 |
| commit | fb7785628a04f9facb0d05867cb5c4cafb646561 (patch) | |
| tree | 9198986215365465771f135fc6288ca4470f1d6e /Gemfile.lock | |
| parent | e2045f5e68b7dfb058f332a07d56ad285ceb6f77 (diff) | |
| parent | 0fbb544c502a30c751a4a8c8f954f853aece93b2 (diff) | |
| download | gitlab-ce-fb7785628a04f9facb0d05867cb5c4cafb646561.tar.gz | |
Merge branch 'rs-update-uglifier' into 'master'
Update uglifier to ~> 2.7.2
Fixes a security vulnerability:
- https://github.com/lautis/uglifier/pull/86
- https://github.com/mishoo/UglifyJS2/issues/751
- https://zyan.scripts.mit.edu/blog/backdooring-js/
See merge request !1590
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7e989aa461b..8cc400aa55c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -741,7 +741,7 @@ GEM simple_oauth (~> 0.1.4) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.3.3) + uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) underscore-rails (1.4.4) @@ -926,7 +926,7 @@ DEPENDENCIES thin (~> 1.6.1) tinder (~> 1.10.0) turbolinks (~> 2.5.0) - uglifier (~> 2.3.2) + uglifier (~> 2.7.2) underscore-rails (~> 1.4.4) unf (~> 0.1.4) unicorn (~> 4.8.2) |