diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-12 21:19:04 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-12 21:19:04 +0000 |
| commit | 3103e567bce530fdeddf87461cb6a0d112df28d6 (patch) | |
| tree | 631dfe2556484fd81a5c236bb31f8883c7a18e5f | |
| parent | 6774a701a6b7a8c2508b5e36bd292a63f3d9d7d6 (diff) | |
| parent | 058f223b01c87fc45825c2459d36371166abfc27 (diff) | |
| download | gitlab-ce-3103e567bce530fdeddf87461cb6a0d112df28d6.tar.gz | |
Merge branch 'fix_constant' into 'master'
ForbiddenAction constant name fix
See merge request !1387
| -rw-r--r-- | app/controllers/omniauth_callbacks_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index 3e984e5007a..442a1cf7518 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -65,7 +65,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController redirect_to omniauth_error_path(oauth['provider'], error: error_message) and return end end - rescue ForbiddenAction => e + rescue Gitlab::OAuth::ForbiddenAction => e flash[:notice] = e.message redirect_to new_user_session_path end |