Merge branch 'note-form-login-link-referer' into 'master'

Added redirect_to_referer to login link on issues ## What does this MR do? Adds a `redirect_to_referer` param to login & register links on issues when not logged in. This makes the login box redirect back to the issue after login. ## What are the relevant issue numbers? Closes #19968 See merge request !5344

Merge branch 'note-form-login-link-referer' into 'master'
e57c0c89 · Fatih Acet · 61e7453e · c7fcd061 · e57c0c89 · e57c0c89
Commit e57c0c89 authored Jul 19, 2016 by Fatih Acet
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

CHANGELOG CHANGELOG +1 -0

_notes_with_form.html.haml app/views/projects/notes/_notes_with_form.html.haml +2 -2

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -42,6 +42,7 @@ v 8.10.0 (unreleased)
  - Add syntax for multiline blockquote using `>>>` fence !3954
  - Fix viewing notification settings when a project is pending deletion
  - Updated compare dropdown menus to use GL dropdown
+  - Redirects back to issue after clicking login link
  - Eager load award emoji on notes
  - Allow to define manual actions/builds on Pipelines and Environments
  - Fix pagination when sorting by columns with lots of ties (like priority)

--- a/app/views/projects/notes/_notes_with_form.html.haml
+++ b/app/views/projects/notes/_notes_with_form.html.haml
@@ -14,9 +14,9 @@
      .disabled-comment.text-center
        .disabled-comment-text.inline
          Please
-          = link_to "register",new_user_session_path
+          = link_to "register", new_session_path(:user, redirect_to_referer: 'yes')
          or
-          = link_to "login",new_user_session_path
+          = link_to "login", new_session_path(:user, redirect_to_referer: 'yes')
          to post a comment
 :javascript