diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-02 21:19:21 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-02 21:19:21 +0000 |
| commit | 90693cc231ba6e1645dc57f2a9111a7b5a5ceae0 (patch) | |
| tree | 3b2cffdb40c949b2f061b7fd0f52d3214325cc17 /config | |
| parent | b9ce0fe1e6311105b7a748126621f9bfbe37fb2e (diff) | |
| download | gitlab-ce-90693cc231ba6e1645dc57f2a9111a7b5a5ceae0.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/delay_delete_own_user.yml | 8 | ||||
| -rw-r--r-- | config/routes/directs.rb | 1 | ||||
| -rw-r--r-- | config/routes/directs/subscription_portal.rb | 19 | ||||
| -rw-r--r-- | config/routes/project.rb | 2 |
4 files changed, 29 insertions, 1 deletions
diff --git a/config/feature_flags/development/delay_delete_own_user.yml b/config/feature_flags/development/delay_delete_own_user.yml new file mode 100644 index 00000000000..030ccd29c00 --- /dev/null +++ b/config/feature_flags/development/delay_delete_own_user.yml @@ -0,0 +1,8 @@ +--- +name: delay_delete_own_user +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118887 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409025 +milestone: '16.0' +type: development +group: group::anti-abuse +default_enabled: false diff --git a/config/routes/directs.rb b/config/routes/directs.rb index f28750b5c2e..407e2a9d8a5 100644 --- a/config/routes/directs.rb +++ b/config/routes/directs.rb @@ -3,3 +3,4 @@ # Custom URL definitions for the Community Edition. draw 'directs/milestone' +draw 'directs/subscription_portal' diff --git a/config/routes/directs/subscription_portal.rb b/config/routes/directs/subscription_portal.rb new file mode 100644 index 00000000000..188725d16c1 --- /dev/null +++ b/config/routes/directs/subscription_portal.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +direct :subscription_portal_staging do + ENV.fetch('STAGING_CUSTOMER_PORTAL_URL', 'https://customers.staging.gitlab.com') +end + +direct :subscription_portal do + default_subscriptions_url = if ::Gitlab.dev_or_test_env? + subscription_portal_staging_url + else + 'https://customers.gitlab.com' + end + + ENV.fetch('CUSTOMER_PORTAL_URL', default_subscriptions_url) +end + +direct :subscription_portal_instance_review do + Addressable::URI.join(subscription_portal_url, '/instance_review').to_s +end diff --git a/config/routes/project.rb b/config/routes/project.rb index ef5f95eee75..93505d84aa6 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -28,7 +28,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do # Begin of the /-/ scope. # Use this scope for all new project routes. scope '-' do - get 'archive/*id', constraints: { format: Gitlab::PathRegex.archive_formats_regex, id: /.+?/ }, to: 'repositories#archive', as: 'archive' + get 'archive/*id', format: true, constraints: { format: Gitlab::PathRegex.archive_formats_regex, id: /.+?/ }, to: 'repositories#archive', as: 'archive' get 'metrics(/:dashboard_path)', constraints: { dashboard_path: /.+\.yml/ }, to: 'metrics_dashboard#show', as: :metrics_dashboard, format: false get 'metrics(/:dashboard_path)/panel/new', constraints: { dashboard_path: /.+\.yml/ }, |