diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-14 15:57:01 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-14 15:57:01 +0000 |
| commit | ffcddb295950729dbc4ee7a3c0e32f7dec00da99 (patch) | |
| tree | 65517ca71234d36700bdaa7a5b9a210e61b528e2 /lib | |
| parent | b8a54fc002aea16bf5024c8749007a0b6f8f7141 (diff) | |
| parent | 435458d2b14eadd1768b7b0a14f5966633f02f83 (diff) | |
| download | gitlab-ce-ffcddb295950729dbc4ee7a3c0e32f7dec00da99.tar.gz | |
Merge branch '28864-use-the-v4-api-from-the-frontend' into 'master'
Resolve "Use the v4 API from the frontend"
Closes #28864
See merge request !9714
Diffstat (limited to 'lib')
| -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 6c275a8d5de..5ab84266b7d 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 = 'v3' # v4 Is not officially released yet, therefore can't be considered as "frozen" + gon.api_version = 'v4' 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.asset_host = ActionController::Base.asset_host |