diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-09-28 15:43:02 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-09-28 15:43:02 +0200 |
| commit | 1c1c7e1abd2ac4f4e88de06f7336bbf8ca5ad3da (patch) | |
| tree | 07ad5566f3c768bccdf4b547640d70da99d89e5b /config | |
| parent | ac34ce8648f48979c257b626a31e65c0ba5b38dc (diff) | |
| parent | 0c877875ea3e7ccbdf48b7736f8c35e2a179ab45 (diff) | |
| download | gitlab-ce-1c1c7e1abd2ac4f4e88de06f7336bbf8ca5ad3da.tar.gz | |
Merge branch 'fxposter/gitlab-ce-login-from-admin'
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index 4a07c449b4e..0792cb559e5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -262,6 +262,7 @@ Gitlab::Application.routes.draw do put :unblock put :unlock put :confirm + post :login_as patch :disable_two_factor delete 'remove/:email_id', action: 'remove_email', as: 'remove_email' end |