Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-07-18 16:56:28 +0300
committerLin Jen-Shin <godfat@godfat.org>2017-07-18 16:56:28 +0300
commit679789ee93b0e5db3863bfcd539e20074c140984 (patch)
treeaa998ee09422203ffe40e4076765636bb852f41d /app/services/ci/create_pipeline_service.rb
parentc86e74b284826e2f53bbcba763edd113a7022ffc (diff)
Rename can_push_or_merge_to_branch? to can_update_branch?
Also make sure pipeline would also check against tag as well
Diffstat (limited to 'app/services/ci/create_pipeline_service.rb')
-rw-r--r--app/services/ci/create_pipeline_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
index 8e2184a1f19..8b689968895 100644
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -89,7 +89,7 @@ module Ci
Ability.allowed?(triggering_user, :create_pipeline, project) &&
if branch?
- access.can_push_or_merge_to_branch?(ref)
+ access.can_update_branch?(ref)
elsif tag?
access.can_create_tag?(ref)
else