diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-01 16:21:28 +0000 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-03-03 18:42:56 -0300 |
| commit | bf5231a1973267fdfbe0a13aa3d42b28127dbbac (patch) | |
| tree | c67c38aad83e20b668349544ef9de2ed94de1e11 | |
| parent | fe2e9a51c60ad9b6fa7dbf9dc3c8ddc38577909a (diff) | |
| download | gitlab-ce-bf5231a1973267fdfbe0a13aa3d42b28127dbbac.tar.gz | |
Merge branch 'js_should_user_right_api_version' into 'master'
The frontend should use the v3 API for now
Closes #28863 and #28853
See merge request !9614
| -rw-r--r-- | lib/gitlab/gon_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb index b8a5ac907a4..9c384069661 100644 --- a/lib/gitlab/gon_helper.rb +++ b/lib/gitlab/gon_helper.rb @@ -1,8 +1,8 @@ module Gitlab module GonHelper def add_gon_variables - gon.api_version = API::API.version - gon.default_avatar_url = URI::join(Gitlab.config.gitlab.url, ActionController::Base.helpers.image_path('no_avatar.png')).to_s + gon.api_version = 'v3' # v4 Is not officially released yet, therefore can't be considered as "frozen" + gon.default_avatar_url = URI.join(Gitlab.config.gitlab.url, ActionController::Base.helpers.image_path('no_avatar.png')).to_s gon.max_file_size = current_application_settings.max_attachment_size gon.relative_url_root = Gitlab.config.gitlab.relative_url_root gon.shortcuts_path = help_page_path('shortcuts') |