diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-07-07 11:32:12 +0400 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-07-11 21:53:10 +0400 |
| commit | 55efb2d9f2f3024137cfd28ec0b58c723f044b42 (patch) | |
| tree | 164a77a84c8a98ee1c958a5732c3a18b0e025f04 /app | |
| parent | f3b0cb77fcb379107cdd4f770fdb16381cda1baf (diff) | |
Revert "Merge branch 'redirect_after_login' into 'master'"
This reverts commit 5aaa35656edaf309354528e197a54461f584ed21, reversing
changes made to 5b8c1767676b94f58558e6de320965c68b57de42.
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/users_sessions_controller.rb | 6 | ||||
| -rw-r--r-- | app/views/devise/sessions/_new_base.html.haml | 6 | ||||
| -rw-r--r-- | app/views/layouts/_public_head_panel.html.haml | 4 |
4 files changed, 6 insertions, 12 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1feeb601d36..9cc63e5c1b9 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -68,7 +68,7 @@ class ApplicationController < ActionController::Base flash[:alert] = "Your account is blocked. Retry when an admin has unblocked it." new_user_session_path else - @return_to || root_path + super end end diff --git a/app/controllers/users_sessions_controller.rb b/app/controllers/users_sessions_controller.rb deleted file mode 100644 index 656c92376fd..00000000000 --- a/app/controllers/users_sessions_controller.rb +++ /dev/null @@ -1,6 +0,0 @@ -class UsersSessionsController < Devise::SessionsController - def create - @return_to = params[:return_to] - super - end -end diff --git a/app/views/devise/sessions/_new_base.html.haml b/app/views/devise/sessions/_new_base.html.haml index d26c0c92cb8..a2f85fa3fe2 100644 --- a/app/views/devise/sessions/_new_base.html.haml +++ b/app/views/devise/sessions/_new_base.html.haml @@ -7,8 +7,8 @@ = f.check_box :remember_me %span Remember me %div - = hidden_field_tag 'return_to', params[:return_to] - = f.submit "Sign in", class: "btn-save btn" - + = f.submit "Sign in", class: "btn-create btn" .pull-right = link_to "Forgot your password?", new_password_path(resource_name), class: "btn" + + diff --git a/app/views/layouts/_public_head_panel.html.haml b/app/views/layouts/_public_head_panel.html.haml index 25984df0444..63992a22f32 100644 --- a/app/views/layouts/_public_head_panel.html.haml +++ b/app/views/layouts/_public_head_panel.html.haml @@ -13,10 +13,10 @@ %i.icon-reorder .pull-right.hidden-xs - = link_to "Sign in", new_session_path(:user, return_to: request.fullpath), class: 'btn btn-sign-in btn-new' + = link_to "Sign in", new_session_path(:user), class: 'btn btn-sign-in btn-new' .navbar-collapse.collapse %ul.nav.navbar-nav %li.visible-xs - = link_to "Sign in", new_session_path(:user, return_to: request.fullpath) + = link_to "Sign in", new_session_path(:user) |