diff options
| author | James Lopez <james@jameslopez.es> | 2016-04-25 18:01:58 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-04-25 18:01:58 +0200 |
| commit | 22ff009a54b281f8db2fd28530b84ebf53bf9de6 (patch) | |
| tree | 3af2f5cf5bd46b22392423cd00522337fc1decc8 /config/routes.rb | |
| parent | 10f1609535742173d8747d3a1097ed7e919fb9e2 (diff) | |
| parent | 81cb636e4fcb7ea76db84a92aac65a73f2376458 (diff) | |
| download | gitlab-ce-22ff009a54b281f8db2fd28530b84ebf53bf9de6.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
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 df6116b6eaf..9f667dca638 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -424,6 +424,7 @@ Rails.application.routes.draw do devise_scope :user do get '/users/auth/:provider/omniauth_error' => 'omniauth_callbacks#omniauth_error', as: :omniauth_error + get '/users/almost_there' => 'confirmations#almost_there' end root to: "root#index" |