diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-01 16:21:28 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-01 16:21:28 +0000 |
| commit | 6885a4d9963863ad658f4d0446d1d7f59be2ec43 (patch) | |
| tree | f8509515e1cf06a0bcee7bcdb03936b024f0476b | |
| parent | b947d6fede791b581095b5b5c98890effc1d499d (diff) | |
| parent | 5a4ad9abce9368cd5a1bde272bc3853882219444 (diff) | |
| download | gitlab-ce-6885a4d9963863ad658f4d0446d1d7f59be2ec43.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb index 101b1b80c1e..9c384069661 100644 --- a/lib/gitlab/gon_helper.rb +++ b/lib/gitlab/gon_helper.rb @@ -1,7 +1,7 @@ module Gitlab module GonHelper def add_gon_variables - gon.api_version = API::API.version + 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 |