diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/0_eager_load_http_cookie.rb | 10 | ||||
| -rw-r--r-- | config/routes/admin.rb | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/config/initializers/0_eager_load_http_cookie.rb b/config/initializers/0_eager_load_http_cookie.rb new file mode 100644 index 00000000000..ed633fdb079 --- /dev/null +++ b/config/initializers/0_eager_load_http_cookie.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +# https://gitlab.com/gitlab-org/gitlab/issues/207937 +# http-cookie is not thread-safe while loading it the first time, see: +# https://github.com/sparklemotion/http-cookie/issues/6#issuecomment-543570876 +# If we're using it, we should eagerly load it. +# For now, we have an implicit dependency on it via: +# * http +# * rest-client +require 'http/cookie_jar/hash_store' if Gem.loaded_specs.key?('http-cookie') diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 5210b84c8ba..54df15137d6 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -33,7 +33,7 @@ namespace :admin do resources :gitaly_servers, only: [:index] namespace :serverless do - resources :domains, only: [:index, :create, :update] do + resources :domains, only: [:index, :create, :update, :destroy] do member do post '/verify', to: 'domains#verify' end |