diff options
| author | connorshea <connor.james.shea@gmail.com> | 2016-04-10 14:21:02 -0600 |
|---|---|---|
| committer | connorshea <connor.james.shea@gmail.com> | 2016-04-10 21:57:42 -0600 |
| commit | a153a1d6fb0aa41de08e07ecfe7e73ccef4dacc2 (patch) | |
| tree | 2c3787cb27a3e6d2831cbec2d6289da88b96bb00 /Gemfile.lock | |
| parent | 0631a1e9e2ad281d460b9183609e9fcef0bf4c6b (diff) | |
| download | gitlab-ce-a153a1d6fb0aa41de08e07ecfe7e73ccef4dacc2.tar.gz | |
Upgrade jQuery Rails from 4.0.5 to 4.1.1
Upgrades jQuery to 1.12.1 and jquery-ujs to 1.2.1.
Changelogs:
https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md
https://blog.jquery.com/2016/01/08/jquery-2-2-and-1-12-released/
https://github.com/rails/jquery-ujs/releases
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 28b71ac7bc8..4c3d7c1f695 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -431,8 +431,8 @@ GEM json ipaddress (0.8.2) jquery-atwho-rails (1.3.2) - jquery-rails (4.0.5) - rails-dom-testing (~> 1.0) + jquery-rails (4.1.1) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-scrollto-rails (1.4.3) @@ -951,7 +951,7 @@ DEPENDENCIES httparty (~> 0.13.3) influxdb (~> 0.2) jquery-atwho-rails (~> 1.3.2) - jquery-rails (~> 4.0.0) + jquery-rails (~> 4.1.0) jquery-scrollto-rails (~> 1.4.3) jquery-turbolinks (~> 2.1.0) jquery-ui-rails (~> 5.0.0) |