diff options
| author | Fabio Pitino <fpitino@gitlab.com> | 2019-05-30 10:23:34 +0100 |
|---|---|---|
| committer | Fabio Pitino <fpitino@gitlab.com> | 2019-05-31 14:55:49 +0100 |
| commit | dbd6223211ec5046535544ea3fe0b8986f51a7e1 (patch) | |
| tree | 4ea29c7c8ec9fe5a73ff71bdf4350a687395c5ca /app/presenters | |
| parent | 12aff0b73cacf533533d584d68307b1b6a030cee (diff) | |
| download | gitlab-ce-dbd6223211ec5046535544ea3fe0b8986f51a7e1.tar.gz | |
Revert a default GIT_DEPTH for MR pipelinerevert-git-depth-for-merge-request
Diffstat (limited to 'app/presenters')
| -rw-r--r-- | app/presenters/ci/build_runner_presenter.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/presenters/ci/build_runner_presenter.rb b/app/presenters/ci/build_runner_presenter.rb index ed3daf6585b..6d46e0bf18a 100644 --- a/app/presenters/ci/build_runner_presenter.rb +++ b/app/presenters/ci/build_runner_presenter.rb @@ -4,7 +4,6 @@ module Ci class BuildRunnerPresenter < SimpleDelegator include Gitlab::Utils::StrongMemoize - DEFAULT_GIT_DEPTH_MERGE_REQUEST = 10 RUNNER_REMOTE_TAG_PREFIX = 'refs/tags/'.freeze RUNNER_REMOTE_BRANCH_PREFIX = 'refs/remotes/origin/'.freeze @@ -28,7 +27,6 @@ module Ci def git_depth strong_memoize(:git_depth) do git_depth = variables&.find { |variable| variable[:key] == 'GIT_DEPTH' }&.dig(:value) - git_depth ||= DEFAULT_GIT_DEPTH_MERGE_REQUEST if merge_request_ref? git_depth.to_i end end @@ -39,12 +37,13 @@ module Ci if git_depth > 0 specs << refspec_for_branch(ref) if branch? || legacy_detached_merge_request_pipeline? specs << refspec_for_tag(ref) if tag? - specs << refspec_for_merge_request_ref if merge_request_ref? else specs << refspec_for_branch specs << refspec_for_tag end + specs << refspec_for_merge_request_ref if merge_request_ref? + specs end |