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 | |
| 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
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 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' diff --git a/Gemfile.lock b/Gemfile.lock index 0011cb9b4b8..2861c423819 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -303,7 +303,7 @@ GEM gollum-rugged_adapter (0.4.2) mime-types (>= 1.15) rugged (~> 0.24.0, >= 0.21.3) - gon (6.0.1) + gon (6.1.0) actionpack (>= 3.0) json multi_json @@ -575,7 +575,7 @@ GEM redis-store (~> 1.1.0) redis-store (1.1.7) redis (>= 2.2) - request_store (1.3.0) + request_store (1.3.1) rerun (0.11.0) listen (~> 3.0) responders (2.1.1) @@ -875,7 +875,7 @@ DEPENDENCIES gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.2) - gon (~> 6.0.1) + gon (~> 6.1.0) grape (~> 0.13.0) grape-entity (~> 0.4.2) hamlit (~> 2.5) |