diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 15:09:37 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 15:09:37 +0000 |
| commit | 2c89e169769ead722394a79ed67fcd08e96863dd (patch) | |
| tree | 0dadb576846c484475b895f75fab41f71cdb952e /config | |
| parent | bd497e352ebd279536ae11855871162e82a3f88c (diff) | |
| download | gitlab-ce-2c89e169769ead722394a79ed67fcd08e96863dd.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/rack_timeout.rb | 2 | ||||
| -rw-r--r-- | config/routes/project.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config/initializers/rack_timeout.rb b/config/initializers/rack_timeout.rb index 1f1264de208..5d5a5fcf980 100644 --- a/config/initializers/rack_timeout.rb +++ b/config/initializers/rack_timeout.rb @@ -12,6 +12,8 @@ if Gitlab::Runtime.puma? && !Rails.env.test? require 'rack/timeout/base' + Rack::Timeout::Logger.level = Logger::ERROR + Gitlab::Application.configure do |config| config.middleware.insert_before(Rack::Runtime, Rack::Timeout, service_timeout: ENV.fetch('GITLAB_RAILS_RACK_TIMEOUT', 60).to_i, diff --git a/config/routes/project.rb b/config/routes/project.rb index 73625416b4b..f153082f118 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -323,6 +323,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end + post 'alerts/notify', to: 'alerting/notifications#create' + resources :pipelines, only: [:index, :new, :create, :show, :destroy] do collection do resource :pipelines_settings, path: 'settings', only: [:show, :update] |