diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-12 12:14:57 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-12 12:14:57 +0300 |
| commit | 60e7627c998b74d48df10b9a7759d6038a1f139c (patch) | |
| tree | 9b643b2e776ea868f4e1546cf1f1fd40bbb10e0f /config | |
| parent | 913af9b06edd2eff6cba93b1daca6c061b93be91 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/net_http_patch.rb | 4 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/config/initializers/net_http_patch.rb b/config/initializers/net_http_patch.rb index a50ba7580cc..4f851d5ee6d 100644 --- a/config/initializers/net_http_patch.rb +++ b/config/initializers/net_http_patch.rb @@ -6,6 +6,10 @@ # See Ruby-lang issue https://bugs.ruby-lang.org/issues/17542 # See issue on GitLab https://gitlab.com/gitlab-org/gitlab/-/issues/289836 +# 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) + module Net class HTTP < Protocol def proxy_user diff --git a/config/routes.rb b/config/routes.rb index 10b1378d924..ebb0984a008 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -163,6 +163,7 @@ InitializerConnections.raise_if_new_database_connection do draw :jira_connect Gitlab.ee do + draw :remote_development draw :security draw :smartcard draw :trial |