diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-08 15:08:17 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-08 15:08:17 +0000 |
| commit | 1ec1bec4ee7ef7cb2e6faa7af625950f6d7aa290 (patch) | |
| tree | 515047b93cfb054156b99c612684eb9a4c45330d /config | |
| parent | 2f5c5b1081fe544ecb9a71d8adf88e00f01f3732 (diff) | |
| download | gitlab-ce-1ec1bec4ee7ef7cb2e6faa7af625950f6d7aa290.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/devise.en.yml | 1 | ||||
| -rw-r--r-- | config/routes/project.rb | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index 5e5fc5f9af7..297254364ac 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -45,6 +45,7 @@ en: signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated." signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked." signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account." + signed_up_but_blocked_pending_approval: "You have signed up successfully. However, we could not sign you in because your account is awaiting approval from your administrator." update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address." updated: "Your account has been updated successfully." sessions: diff --git a/config/routes/project.rb b/config/routes/project.rb index 2c681b3cbe7..1072a037823 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -307,6 +307,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do get 'details', on: :member end + resource :tracing, only: [:show] + post 'incidents/integrations/pagerduty', to: 'incident_management/pager_duty_incidents#create' resources :incidents, only: [:index] @@ -551,6 +553,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do Gitlab::Routing.redirect_legacy_paths(self, :mirror, :tags, :cycle_analytics, :mattermost, :variables, :triggers, :environments, :protected_environments, :error_tracking, :alert_management, + :tracing, :serverless, :clusters, :audit_events, :wikis, :merge_requests, :vulnerability_feedback, :security, :dependencies, :issues) end |