diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-01-03 17:53:22 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-01-03 17:53:22 +0900 |
| commit | bc236e0046f749aee48e054925334862d72f2dc3 (patch) | |
| tree | 916b045bac0eee8400a908594f775988f1f32b30 /app/models/ci | |
| parent | e216ac2c962ebacec2fa2bdc73f5b53e0068d8c1 (diff) | |
| download | gitlab-ce-bc236e0046f749aee48e054925334862d72f2dc3.tar.gz | |
Add a comment on `Ci::Pipeline#git_ref` about merge request refadd-a-comment-on-ci-pipeline-git_ref-about-merge-request-ref
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 |