summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorKrasimir Angelov <kangelov@gitlab.com>2019-06-06 23:08:01 +1200
committerKrasimir Angelov <kangelov@gitlab.com>2019-06-06 23:22:50 +1200
commit52673a916df0f759262afa1aaa230f7d62efd554 (patch)
tree0635538d8bf562e914c0bb44f1580cf9d56aa5f3 /app/models
parentad9ae16d8a44dd2523bd6e6109db9fe2da45d3a5 (diff)
downloadgitlab-ce-52673a916df0f759262afa1aaa230f7d62efd554.tar.gz
Forks get default_git_depth 0 if the origin is nil
If the origin project has no default_git_depth set (i.e. nil) set the fork's default_git_depth to 0
Diffstat (limited to 'app/models')
-rw-r--r--app/models/project_ci_cd_setting.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/project_ci_cd_setting.rb b/app/models/project_ci_cd_setting.rb
index cf1f80fd1ef..9e7d921c229 100644
--- a/app/models/project_ci_cd_setting.rb
+++ b/app/models/project_ci_cd_setting.rb
@@ -8,7 +8,7 @@ class ProjectCiCdSetting < ApplicationRecord
DEFAULT_GIT_DEPTH = 50
- before_create :set_default_git_depth, unless: :default_git_depth?
+ before_create :set_default_git_depth
validates :default_git_depth,
numericality: {
@@ -31,6 +31,8 @@ class ProjectCiCdSetting < ApplicationRecord
private
def set_default_git_depth
+ return if default_git_depth
+
self.default_git_depth = DEFAULT_GIT_DEPTH
end
end