Commit a0d81c52 authored by Mark Lapierre's avatar Mark Lapierre Committed by Nikola Milojevic

Methods weren't meant to be private

parent f046893a
......@@ -2642,6 +2642,42 @@ class Project < ApplicationRecord
end
alias_method :container_registry_enabled?, :container_registry_enabled
def ci_forward_deployment_enabled?
return false unless ci_cd_settings
ci_cd_settings.forward_deployment_enabled?
end
def ci_job_token_scope_enabled?
return false unless ci_cd_settings
ci_cd_settings.job_token_scope_enabled?
end
def restrict_user_defined_variables?
return false unless ci_cd_settings
ci_cd_settings.restrict_user_defined_variables?
end
def keep_latest_artifacts_available?
return false unless ci_cd_settings
ci_cd_settings.keep_latest_artifacts_available?
end
def keep_latest_artifact?
return false unless ci_cd_settings
ci_cd_settings.keep_latest_artifact?
end
def group_runners_enabled?
return false unless ci_cd_settings
ci_cd_settings.group_runners_enabled?
end
private
def set_container_registry_access_level
......@@ -2830,42 +2866,6 @@ class Project < ApplicationRecord
def online_runners_with_tags
@online_runners_with_tags ||= active_runners_with_tags.online
end
def ci_forward_deployment_enabled?
return false unless ci_cd_settings
ci_cd_settings.forward_deployment_enabled?
end
def ci_job_token_scope_enabled?
return false unless ci_cd_settings
ci_cd_settings.job_token_scope_enabled?
end
def restrict_user_defined_variables?
return false unless ci_cd_settings
ci_cd_settings.restrict_user_defined_variables?
end
def keep_latest_artifacts_available?
return false unless ci_cd_settings
ci_cd_settings.keep_latest_artifacts_available?
end
def keep_latest_artifact?
return false unless ci_cd_settings
ci_cd_settings.keep_latest_artifact?
end
def group_runners_enabled?
return false unless ci_cd_settings
ci_cd_settings.group_runners_enabled?
end
end
Project.prepend_mod_with('Project')
......@@ -800,6 +800,30 @@ module EE
available_features[feature]
end
def merge_pipelines_enabled?
return false unless ci_cd_settings
ci_cd_settings.merge_pipelines_enabled?
end
def merge_pipelines_were_disabled?
return false unless ci_cd_settings
ci_cd_settings.merge_pipelines_were_disabled?
end
def merge_trains_enabled?
return false unless ci_cd_settings
ci_cd_settings.merge_trains_enabled?
end
def auto_rollback_enabled?
return false unless ci_cd_settings
ci_cd_settings.auto_rollback_enabled?
end
private
def github_integration_enabled?
......@@ -877,29 +901,5 @@ module EE
end
end
end
def merge_pipelines_enabled?
return false unless ci_cd_settings
ci_cd_settings.merge_pipelines_enabled?
end
def merge_pipelines_were_disabled?
return false unless ci_cd_settings
ci_cd_settings.merge_pipelines_were_disabled?
end
def merge_trains_enabled?
return false unless ci_cd_settings
ci_cd_settings.merge_trains_enabled?
end
def auto_rollback_enabled?
return false unless ci_cd_settings
ci_cd_settings.auto_rollback_enabled?
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment