diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 21:09:27 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 21:09:27 +0300 |
| commit | bf213f07c8146b7121240af90a07cb4b2ecc41fa (patch) | |
| tree | 184537ad2334124c5090f2a729a9fd58bccf6b51 /config | |
| parent | dd2da214c9644ef1064061d706dfeec50f9fad8f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/devise.en.yml | 2 | ||||
| -rw-r--r-- | config/routes/project.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index ee75ffbb8e9..e8110e21766 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -53,7 +53,7 @@ en: errors: messages: already_confirmed: "was already confirmed, please try signing in" - confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one" + confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one below" expired: "has expired, please request a new one" not_found: "not found" not_locked: "was not locked" diff --git a/config/routes/project.rb b/config/routes/project.rb index 3bd72dbf87c..dd94e6155a0 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -291,6 +291,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do get 'details', on: :member end + post 'incidents/integrations/pagerduty', to: 'incident_management/pager_duty_incidents#create' + namespace :error_tracking do resources :projects, only: :index end @@ -407,8 +409,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do post 'alerts/notify', to: 'alerting/notifications#create' - post 'incidents/pagerduty', to: 'incident_management/pager_duty_incidents#create' - draw :legacy_builds resources :hooks, only: [:index, :create, :edit, :update, :destroy], constraints: { id: /\d+/ } do # rubocop: disable Cop/PutProjectRoutesUnderScope |