diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-02 15:06:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-02 15:06:59 +0300 |
| commit | e9570ea27e2dc549962b9b318af369e9363fd1c4 (patch) | |
| tree | 1a6aabfa0b41df8f6400a7bbcabe0bdb54f10fe7 /config | |
| parent | 7e8ecb5c00aae3b7072a5b8ff2c53db03c0bc579 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/hide_create_issue_resolve_all.yml | 8 | ||||
| -rw-r--r-- | config/initializers/net_http_patch.rb | 4 | ||||
| -rw-r--r-- | config/routes.rb | 1 | ||||
| -rw-r--r-- | config/routes/well_known.rb | 3 |
4 files changed, 7 insertions, 9 deletions
diff --git a/config/feature_flags/development/hide_create_issue_resolve_all.yml b/config/feature_flags/development/hide_create_issue_resolve_all.yml deleted file mode 100644 index 504961f8f5b..00000000000 --- a/config/feature_flags/development/hide_create_issue_resolve_all.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: hide_create_issue_resolve_all -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116322 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/404498 -milestone: '15.11' -type: development -group: group::ux paper cuts -default_enabled: false diff --git a/config/initializers/net_http_patch.rb b/config/initializers/net_http_patch.rb index 4f851d5ee6d..8231423e1a5 100644 --- a/config/initializers/net_http_patch.rb +++ b/config/initializers/net_http_patch.rb @@ -6,9 +6,11 @@ # See Ruby-lang issue https://bugs.ruby-lang.org/issues/17542 # See issue on GitLab https://gitlab.com/gitlab-org/gitlab/-/issues/289836 +require 'net/http' + # This file can be removed once Ruby 3.0 is no longer supported: # https://gitlab.com/gitlab-org/gitlab/-/issues/396223 -return if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new(3.1) +return if Gem::Version.new(Net::HTTP::VERSION) >= Gem::Version.new('0.2.0') module Net class HTTP < Protocol diff --git a/config/routes.rb b/config/routes.rb index 575b3089307..3a09bf4b136 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -284,6 +284,7 @@ InitializerConnections.raise_if_new_database_connection do draw :user draw :project draw :unmatched_project + draw :well_known # Issue https://gitlab.com/gitlab-org/gitlab/-/issues/210024 scope as: 'deprecated' do diff --git a/config/routes/well_known.rb b/config/routes/well_known.rb new file mode 100644 index 00000000000..0c48f116da9 --- /dev/null +++ b/config/routes/well_known.rb @@ -0,0 +1,3 @@ +# frozen_string_literal: true + +get '/.well-known/change-password', to: redirect('-/profile/password/edit'), status: 302 |