From 64295a18c5bd9f4e92cddb5d1f391657a3757fe2 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 23 Sep 2015 12:47:29 +0200
Subject: [PATCH] Get GitLabCiService token from CI project
---
app/models/project_services/gitlab_ci_service.rb | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/app/models/project_services/gitlab_ci_service.rb b/app/models/project_services/gitlab_ci_service.rb
index df92c6158e7..773b61efd6f 100644
--- a/app/models/project_services/gitlab_ci_service.rb
+++ b/app/models/project_services/gitlab_ci_service.rb
@@ -21,8 +21,6 @@
class GitlabCiService < CiService
include Gitlab::Application.routes.url_helpers
- prop_accessor :token
-
after_save :compose_service_hook, if: :activated?
def compose_service_hook
@@ -53,6 +51,12 @@ class GitlabCiService < CiService
end
end
+ def token
+ if project.gitlab_ci_project.present?
+ project.gitlab_ci_project.token
+ end
+ end
+
def get_ci_commit(sha, ref)
Ci::Project.find(project.gitlab_ci_project).commits.find_by_sha_and_ref!(sha, ref)
end
@@ -69,8 +73,7 @@ class GitlabCiService < CiService
name_with_namespace: new_project.name_with_namespace,
path_with_namespace: new_project.path_with_namespace,
web_url: new_project.web_url,
- default_branch: new_project.default_branch,
- ssh_url_to_repo: new_project.ssh_url_to_repo
+ default_branch: new_project.default_branch
})
ci_project = Ci::Project.find_by!(gitlab_id: project.id)
--
GitLab