diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-11-08 10:47:45 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-11-08 10:47:45 +0000 |
| commit | 9c3f3e9e359740b10edafaa1b06b0ff3e2070820 (patch) | |
| tree | 01846d1a63bd1177b68377822fcb23b86e176cf2 /config | |
| parent | 8f85bd5789d50c080a7214981cc0a45fcb382bef (diff) | |
| parent | 011e561bfa227f3ecbafe5b1ffd51700c680a15f (diff) | |
| download | gitlab-ce-9c3f3e9e359740b10edafaa1b06b0ff3e2070820.tar.gz | |
Merge branch 'use-separate-token-for-incoming-email' into 'master'
Use separate email-friendly token for incoming email
See merge request !5914
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/profile.rb | 1 | ||||
| -rw-r--r-- | config/routes/project.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config/routes/profile.rb b/config/routes/profile.rb index 4cb68c9b34a..52b9a565db8 100644 --- a/config/routes/profile.rb +++ b/config/routes/profile.rb @@ -4,6 +4,7 @@ resource :profile, only: [:show, :update] do get :applications, to: 'oauth/applications#index' put :reset_private_token + put :reset_incoming_email_token put :update_username end diff --git a/config/routes/project.rb b/config/routes/project.rb index 8142e231621..7a1bfa6a9f0 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -18,6 +18,7 @@ resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only: get :autocomplete_sources get :activity get :refs + put :new_issue_address end scope module: :projects do |