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 | |
| 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')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -217,7 +217,7 @@ gem 'font-awesome-rails', '~> 4.2' gem 'gitlab_emoji', '~> 0.3.0' gem 'gon', '~> 6.0.1' gem 'jquery-atwho-rails', '~> 1.3.2' -gem 'jquery-rails', '~> 4.0.0' +gem 'jquery-rails', '~> 4.1.0' gem 'jquery-scrollto-rails', '~> 1.4.3' gem 'jquery-ui-rails', '~> 5.0.0' gem 'raphael-rails', '~> 2.1.2' |