diff options
Diffstat (limited to 'config')
-rw-r--r-- | config/feature_flags/development/gcp_technical_demo.yml | 8 | ||||
-rw-r--r-- | config/initializers/rest-client-hostname_override.rb | 2 | ||||
-rw-r--r-- | config/routes/gcp.rb | 13 | ||||
-rw-r--r-- | config/routes/project.rb | 1 |
4 files changed, 1 insertions, 23 deletions
diff --git a/config/feature_flags/development/gcp_technical_demo.yml b/config/feature_flags/development/gcp_technical_demo.yml deleted file mode 100644 index 98e4529ed33..00000000000 --- a/config/feature_flags/development/gcp_technical_demo.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: gcp_technical_demo -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139802 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434685 -milestone: '16.7' -type: development -group: group::container registry -default_enabled: false diff --git a/config/initializers/rest-client-hostname_override.rb b/config/initializers/rest-client-hostname_override.rb index c12c0d431fd..6a8c7285de5 100644 --- a/config/initializers/rest-client-hostname_override.rb +++ b/config/initializers/rest-client-hostname_override.rb @@ -20,7 +20,7 @@ module RestClient raise ArgumentError, "URL is blocked: #{e.message}" end - # Gitlab::UrlBlocker returns a Addressable::URI which we need to coerce + # Gitlab::HTTP_V2::UrlBlocker returns a Addressable::URI which we need to coerce # to URI so that rest-client can use it to determine if it's a # URI::HTTPS or not. It uses it to set `net.use_ssl` to true or not: # diff --git a/config/routes/gcp.rb b/config/routes/gcp.rb deleted file mode 100644 index b5e7c561782..00000000000 --- a/config/routes/gcp.rb +++ /dev/null @@ -1,13 +0,0 @@ -# frozen_string_literal: true - -# All routing related to gcp -# that is already under /-/ scope only - -scope format: false do - namespace :gcp do - namespace :artifact_registry do - resources :docker_images, only: :index - resources :setup, only: :new - end - end -end diff --git a/config/routes/project.rb b/config/routes/project.rb index 23733bbe821..c8d81535da8 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -408,7 +408,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do # its preferable to keep it below all other project routes draw :repository draw :wiki - draw :gcp namespace :import do resource :jira, only: [:show], controller: :jira |