diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 15:09:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 15:09:13 +0300 |
| commit | 1363ca12f1f07c634647cf55c4c16b7401098673 (patch) | |
| tree | d932caf09c8148322edb51ae954ed159ff7d00f8 /app/helpers | |
| parent | 6763d2787670bc03a36a8eb601703e88fc70dece (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/blob_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/ci_variables_helper.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index cc5ae32856a..4debf66db64 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -344,8 +344,8 @@ module BlobHelper def show_suggest_pipeline_creation_celebration? experiment_enabled?(:suggest_pipeline) && - @blob.auxiliary_viewer.valid?(project: @project, sha: @commit.sha, user: current_user) && @blob.path == Gitlab::FileDetector::PATTERNS[:gitlab_ci] && + @blob.auxiliary_viewer.valid?(project: @project, sha: @commit.sha, user: current_user) && @project.uses_default_ci_config? && cookies[suggest_pipeline_commit_cookie_name].present? end diff --git a/app/helpers/ci_variables_helper.rb b/app/helpers/ci_variables_helper.rb index 3f4c04070b5..b271f069778 100644 --- a/app/helpers/ci_variables_helper.rb +++ b/app/helpers/ci_variables_helper.rb @@ -45,6 +45,6 @@ module CiVariablesHelper end def ci_variable_maskable_regex - Maskable::REGEX.inspect.sub('\\A', '^').sub('\\z', '$').sub(/^\//, '').sub(/\/[a-z]*$/, '').gsub('\/', '/') + Ci::Maskable::REGEX.inspect.sub('\\A', '^').sub('\\z', '$').sub(/^\//, '').sub(/\/[a-z]*$/, '').gsub('\/', '/') end end |