diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-01-04 11:06:08 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-01-04 11:06:08 +0000 |
| commit | 297d1fa092375a9a22630e235528522a0f733e7d (patch) | |
| tree | 27775fe17a813b1511c857539ee2a5182939a8d9 /app/models/ci | |
| parent | 147f740730b63dbdd4c457bb3a783510d225d73b (diff) | |
| parent | bc236e0046f749aee48e054925334862d72f2dc3 (diff) | |
| download | gitlab-ce-297d1fa092375a9a22630e235528522a0f733e7d.tar.gz | |
Merge branch 'add-a-comment-on-ci-pipeline-git_ref-about-merge-request-ref' into 'master'
Add a comment on `Ci::Pipeline#git_ref` about merge request ref
Closes #54908
See merge request gitlab-org/gitlab-ce!24114
Diffstat (limited to 'app/models/ci')
| -rw-r--r-- | app/models/ci/pipeline.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 1f5017cc3c3..c12403ea9d2 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -714,6 +714,12 @@ module Ci def git_ref if merge_request? + ## + # In the future, we're going to change this ref to + # merge request's merged reference, such as "refs/merge-requests/:iid/merge". + # In order to do that, we have to update GitLab-Runner's source pulling + # logic. + # See https://gitlab.com/gitlab-org/gitlab-runner/merge_requests/1092 Gitlab::Git::BRANCH_REF_PREFIX + ref.to_s else super |