diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 21:08:55 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 21:08:55 +0000 |
| commit | 51612d3ef5be853289008694c40973b479e8547c (patch) | |
| tree | 0a74213e94c9b6d81f6f0cb01e0b5dbff26f5444 /app/models | |
| parent | ca05512007cea51e05d3431b2c8bd7228c754370 (diff) | |
| download | gitlab-ce-51612d3ef5be853289008694c40973b479e8547c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 31aeb0146df..8a751b0d706 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -2299,6 +2299,10 @@ class Project < ApplicationRecord false end + def uses_default_ci_config? + ci_config_path.blank? || ci_config_path == Gitlab::FileDetector::PATTERNS[:gitlab_ci] + end + private def closest_namespace_setting(name) |