diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-07-19 16:12:33 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-19 17:35:56 +0300 |
| commit | 1b3130f349af888aeb646b40afa6aef903df1300 (patch) | |
| tree | 05d40d152929d79f0a99c5bf1f250345f0f1f10d | |
| parent | 8d712b66cd9e3a5090e333b52dc20c9bbdbd0030 (diff) | |
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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/projects/notes/_notes_with_form.html.haml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index f1c946377d6..b61cd2c09c8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -40,6 +40,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) diff --git a/app/views/projects/notes/_notes_with_form.html.haml b/app/views/projects/notes/_notes_with_form.html.haml index 56d302fab82..74538a9723e 100644 --- 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 |