diff options
| author | karen Carias <karen@gitlab.com> | 2015-07-16 11:25:12 -0700 |
|---|---|---|
| committer | karen Carias <karen@gitlab.com> | 2015-07-16 11:25:12 -0700 |
| commit | 70a08acedf96b685fea93f759637439884a66aa7 (patch) | |
| tree | 49041f01ed1f0ee4098ac9105d84f5cdbf8baedb /config/routes.rb | |
| parent | 53d40b8ab1275fa39e1ae4b82a228ccf731045f9 (diff) | |
| parent | 9b6f1c59484a0c0e4cee9a27cfa4dc9a89683848 (diff) | |
| download | gitlab-ce-70a08acedf96b685fea93f759637439884a66aa7.tar.gz | |
fixed conflict
Diffstat (limited to 'config/routes.rb')
| -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 fd04d7b2f54..055d59a0c93 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -159,6 +159,7 @@ Gitlab::Application.routes.draw do put :block put :unblock put :unlock + patch :disable_two_factor delete 'remove/:email_id', action: 'remove_email', as: 'remove_email' end end |