gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_callback_url' into 'master' 

Use ci url for callback.

Fixes https://dev.gitlab.org/gitlab/omnibus-gitlab/issues/23

See merge request !399
This commit is contained in:
Marin Jankovski 2015-07-01 11:25:39 +00:00 committed by Marin Jankovski
parent 008c9016e6
commit dbb46b073d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
files/gitlab-cookbooks/gitlab/libraries/helper.rb
View File

@ -107,7 +107,7 @@ class CiHelper
def self.authorize_with_gitlab(gitlab_external_url)
warn("Connecting to GitLab to generate new app_id and app_secret.")
runner_cmd = create_or_find_authorization(gitlab_external_url)
runner_cmd = create_or_find_authorization
cmd = execute_rails_runner(runner_cmd)
o = do_shell_out(cmd)
@ -129,8 +129,9 @@ class CiHelper
{ 'url' => gitlab_external_url, 'app_id' => app_id, 'app_secret' => app_secret }
end
def self.create_or_find_authorization(gitlab_external_url)
args = %Q(redirect_uri: "#{gitlab_external_url}/user_sessions/callback", name: "GitLab CI")
def self.create_or_find_authorization
ci_external_url = Gitlab['ci_external_url']
args = %Q(redirect_uri: "#{ci_external_url}/user_sessions/callback", name: "GitLab CI")
app = %Q(app = Doorkeeper::Application.where(#{args}).first_or_create;)