diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-01 00:10:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-01 00:10:33 +0300 |
| commit | 16d8ebae46866ffe7135c3e4b931001b846441f4 (patch) | |
| tree | d4b2ea6c76fe3bebeef68d85e0553e8de1f552e4 /app | |
| parent | 99f37f7ebdeb0e7b7493d9f6294086cc90778304 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/concerns/sourcegraph_decorator.rb | 2 | ||||
| -rw-r--r-- | app/models/ci/runner_namespace.rb | 1 | ||||
| -rw-r--r-- | app/models/ci/runner_project.rb | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/concerns/sourcegraph_decorator.rb b/app/controllers/concerns/sourcegraph_decorator.rb index 5ef09b9221f..061990a4361 100644 --- a/app/controllers/concerns/sourcegraph_decorator.rb +++ b/app/controllers/concerns/sourcegraph_decorator.rb @@ -11,7 +11,7 @@ module SourcegraphDecorator next unless Gitlab::CurrentSettings.sourcegraph_enabled default_connect_src = p.directives['connect-src'] || p.directives['default-src'] - connect_src_values = Array.wrap(default_connect_src) | [Gitlab::CurrentSettings.sourcegraph_url] + connect_src_values = Array.wrap(default_connect_src) | [Gitlab::Utils.append_path(Gitlab::CurrentSettings.sourcegraph_url, '.api/')] p.connect_src(*connect_src_values) end end diff --git a/app/models/ci/runner_namespace.rb b/app/models/ci/runner_namespace.rb index 52a31863fb2..82390ccc538 100644 --- a/app/models/ci/runner_namespace.rb +++ b/app/models/ci/runner_namespace.rb @@ -7,7 +7,6 @@ module Ci self.limit_name = 'ci_registered_group_runners' self.limit_scope = :group self.limit_relation = :recent_runners - self.limit_feature_flag_for_override = :ci_runner_limits_override belongs_to :runner, inverse_of: :runner_namespaces belongs_to :namespace, inverse_of: :runner_namespaces, class_name: '::Namespace' diff --git a/app/models/ci/runner_project.rb b/app/models/ci/runner_project.rb index 148a29a0f8b..42c24c8c8d1 100644 --- a/app/models/ci/runner_project.rb +++ b/app/models/ci/runner_project.rb @@ -7,7 +7,6 @@ module Ci self.limit_name = 'ci_registered_project_runners' self.limit_scope = :project self.limit_relation = :recent_runners - self.limit_feature_flag_for_override = :ci_runner_limits_override belongs_to :runner, inverse_of: :runner_projects belongs_to :project, inverse_of: :runner_projects |