diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project.rb | 2 | ||||
| -rw-r--r-- | app/models/project_auto_devops.rb | 2 | ||||
| -rw-r--r-- | app/services/ci/create_pipeline_service.rb | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 541c950e369..b52b1e9049b 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1390,7 +1390,7 @@ class Project < ActiveRecord::Base end def has_ci? - @repository.gitlab_ci_yml || @project.auto_devops_enabled? + repository.gitlab_ci_yml || auto_devops_enabled? end def predefined_variables diff --git a/app/models/project_auto_devops.rb b/app/models/project_auto_devops.rb index c54e421957b..53731579e87 100644 --- a/app/models/project_auto_devops.rb +++ b/app/models/project_auto_devops.rb @@ -1,7 +1,7 @@ class ProjectAutoDevops < ActiveRecord::Base belongs_to :project - validates :domain, presence: true, hostname: { allow_numeric_hostname: true }, if: :enabled? + validates :domain, allow_blank: true, hostname: { allow_numeric_hostname: true } def variables variables = [] diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb index f18064d0478..414c01b2546 100644 --- a/app/services/ci/create_pipeline_service.rb +++ b/app/services/ci/create_pipeline_service.rb @@ -72,7 +72,6 @@ module Ci unless pipeline.ci_yaml_file return error("Missing #{pipeline.ci_yaml_file_path} file") end - return error(pipeline.yaml_errors, save: save_on_errors) end |