diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-04-25 16:12:08 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-04-25 16:12:08 +0000 |
| commit | c295f0d2cc910bb0b719d28ae22adf34fea95c59 (patch) | |
| tree | af07b4916bf56b3f5b3bab08683db4cf9624713b /Gemfile.lock | |
| parent | 81cb636e4fcb7ea76db84a92aac65a73f2376458 (diff) | |
| parent | a153a1d6fb0aa41de08e07ecfe7e73ccef4dacc2 (diff) | |
| download | gitlab-ce-c295f0d2cc910bb0b719d28ae22adf34fea95c59.tar.gz | |
Merge branch 'update-jquery-rails' into 'master'
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
See merge request !3642
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 add056b169f..f6558fc44fe 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) @@ -952,7 +952,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) |