diff options
| author | Phil Hughes <me@iamphill.com> | 2017-11-27 09:07:14 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-11-27 09:07:14 +0000 |
| commit | 03b891c5791f17bbe426a47f53e0f46704543182 (patch) | |
| tree | 5e5232127d182d020bd9c982b63d869a4d2f174c /Gemfile.lock | |
| parent | 5d8906766068a230f96c6fc5df182553edff69e1 (diff) | |
| parent | b95445ba8657fd154d3bba6a2877c1f2f165845c (diff) | |
| download | gitlab-ce-03b891c5791f17bbe426a47f53e0f46704543182.tar.gz | |
Merge branch '40481-bump-jquery-to-2-2-4' into 'master'
Upgrade jQuery to 2.2.4
Closes #40481
See merge request gitlab-org/gitlab-ce!15570
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 3fcb223dd4e..c46bed111b9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -411,7 +411,7 @@ GEM multipart-post oauth (~> 0.5, >= 0.5.0) jquery-atwho-rails (1.3.2) - jquery-rails (4.1.1) + jquery-rails (4.3.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -1061,7 +1061,7 @@ DEPENDENCIES influxdb (~> 0.2) jira-ruby (~> 1.4) jquery-atwho-rails (~> 1.3.2) - jquery-rails (~> 4.1.0) + jquery-rails (~> 4.3.1) json-schema (~> 2.8.0) jwt (~> 1.5.6) kaminari (~> 1.0) |