diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-16 00:06:14 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-16 00:06:14 +0300 |
commit | ae50a43c43229442e5ccef4034d62df8a3c36cbc (patch) | |
tree | 6ed44a0e6515275719e1ba744baf457fe3044793 /app | |
parent | eca3cd3a9e7d9ea680086cad8150050ec8cdef3f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/models/ci/build.rb | 2 | ||||
-rw-r--r-- | app/models/concerns/ci/processable.rb | 8 | ||||
-rw-r--r-- | app/models/pages_domain.rb | 2 | ||||
-rw-r--r-- | app/views/projects/settings/ci_cd/show.html.haml | 3 | ||||
-rw-r--r-- | app/views/shared/runners/_runner_description.html.haml | 2 |
5 files changed, 13 insertions, 4 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 62815589c3c..4804364d404 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -42,7 +42,6 @@ module Ci has_one :deployment, as: :deployable, class_name: 'Deployment' has_many :trace_sections, class_name: 'Ci::BuildTraceSection' has_many :trace_chunks, class_name: 'Ci::BuildTraceChunk', foreign_key: :build_id - has_many :needs, class_name: 'Ci::BuildNeed', foreign_key: :build_id, inverse_of: :build has_many :job_artifacts, class_name: 'Ci::JobArtifact', foreign_key: :job_id, dependent: :destroy, inverse_of: :job # rubocop:disable Cop/ActiveRecordDependent has_many :job_variables, class_name: 'Ci::JobVariable', foreign_key: :job_id @@ -56,7 +55,6 @@ module Ci accepts_nested_attributes_for :runner_session accepts_nested_attributes_for :job_variables - accepts_nested_attributes_for :needs delegate :url, to: :runner_session, prefix: true, allow_nil: true delegate :terminal_specification, to: :runner_session, allow_nil: true diff --git a/app/models/concerns/ci/processable.rb b/app/models/concerns/ci/processable.rb index 268fa8ec692..ed0087f34d4 100644 --- a/app/models/concerns/ci/processable.rb +++ b/app/models/concerns/ci/processable.rb @@ -8,6 +8,14 @@ module Ci # # module Processable + extend ActiveSupport::Concern + + included do + has_many :needs, class_name: 'Ci::BuildNeed', foreign_key: :build_id, inverse_of: :build + + accepts_nested_attributes_for :needs + end + def schedulable? raise NotImplementedError end diff --git a/app/models/pages_domain.rb b/app/models/pages_domain.rb index 7903a2182dd..3869d86b667 100644 --- a/app/models/pages_domain.rb +++ b/app/models/pages_domain.rb @@ -24,6 +24,8 @@ class PagesDomain < ApplicationRecord validate :validate_matching_key, if: ->(domain) { domain.certificate.present? || domain.key.present? } validate :validate_intermediates, if: ->(domain) { domain.certificate.present? && domain.certificate_changed? } + default_value_for(:auto_ssl_enabled, allow_nil: false) { ::Gitlab::LetsEncrypt.enabled? } + attr_encrypted :key, mode: :per_attribute_iv_and_salt, insecure_mode: true, diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml index 87000e8270b..862db23e856 100644 --- a/app/views/projects/settings/ci_cd/show.html.haml +++ b/app/views/projects/settings/ci_cd/show.html.haml @@ -37,7 +37,8 @@ %button.btn.js-settings-toggle{ type: 'button' } = expanded ? _('Collapse') : _('Expand') %p - = _("Register and see your runners for this project.") + = _("Runners are processes that pick up and execute jobs for GitLab. Here you can register and see your Runners for this project.") + = link_to s_('More information'), help_page_path('ci/runners/README') .settings-content = render 'projects/runners/index' diff --git a/app/views/shared/runners/_runner_description.html.haml b/app/views/shared/runners/_runner_description.html.haml index 5935750ca06..a47bbd55325 100644 --- a/app/views/shared/runners/_runner_description.html.haml +++ b/app/views/shared/runners/_runner_description.html.haml @@ -1,6 +1,6 @@ .light.prepend-top-default %p - = _("A 'Runner' is a process which runs a job. You can set up as many Runners as you need.") + = _("You can set up as many Runners as you need to run your jobs.") %br = _('Runners can be placed on separate users, servers, and even on your local machine.') |