diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-27 17:30:05 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-27 17:30:05 +0000 |
| commit | 0d022db54e97a7b553bee8f8fef8704b8c41c35b (patch) | |
| tree | d30cddac7606a94d7af5fd3d439565abd5783bc7 /Gemfile | |
| parent | d7e3ecf448996f48ed298e16824373ab3d69438a (diff) | |
| parent | 02913a96359938f58743ac962f9b16081db92ffc (diff) | |
| download | gitlab-ce-0d022db54e97a7b553bee8f8fef8704b8c41c35b.tar.gz | |
Merge branch 'cs-upgrade-gon' into 'master'
Upgrade gon from 6.0.1 to 6.1.0.
Removes methods that were deprecated in Rails 5. Working toward #14286.
Changelog: https://github.com/gazay/gon/compare/3a2b56d...9d89bc9
See merge request !5442
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -225,7 +225,7 @@ gem 'addressable', '~> 2.3.8' gem 'bootstrap-sass', '~> 3.3.0' gem 'font-awesome-rails', '~> 4.6.1' gem 'gemojione', '~> 3.0' -gem 'gon', '~> 6.0.1' +gem 'gon', '~> 6.1.0' gem 'jquery-atwho-rails', '~> 1.3.2' gem 'jquery-rails', '~> 4.1.0' gem 'jquery-ui-rails', '~> 5.0.0' |