Remember user's inline/tabular diff view preference in a cookie
This commit is contained in:
parent
9afcacb3a4
commit
cf1349adb7
|
@ -22,6 +22,7 @@ v 8.5.0 (unreleased)
|
|||
- Fix visibility level text in admin area (Zeger-Jan van de Weg)
|
||||
- Warn admin during OAuth of granting admin rights (Zeger-Jan van de Weg)
|
||||
- Update the ExternalIssue regex pattern (Blake Hitchcock)
|
||||
- Remember user's inline/tabular diff view preference in a cookie (Kirill Katsnelson)
|
||||
- Optimized performance of finding issues to be closed by a merge request
|
||||
- Revert "Add IP check against DNSBLs at account sign-up"
|
||||
- Fix API to keep request parameters in Link header (Michael Potthoff)
|
||||
|
|
|
@ -26,6 +26,13 @@ class Projects::ApplicationController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def apply_diff_view_cookie!
|
||||
view = params[:view] || cookies[:diff_view]
|
||||
cookies.permanent[:diff_view] = params[:view] = view if view
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def builds_enabled
|
||||
|
|
|
@ -13,6 +13,8 @@ class Projects::CommitController < Projects::ApplicationController
|
|||
def show
|
||||
return git_not_found! unless @commit
|
||||
|
||||
apply_diff_view_cookie!
|
||||
|
||||
@line_notes = commit.notes.inline
|
||||
@note = @project.build_commit_note(commit)
|
||||
@notes = commit.notes.not_inline.fresh
|
||||
|
|
|
@ -57,6 +57,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
|
|||
end
|
||||
|
||||
def diffs
|
||||
apply_diff_view_cookie!
|
||||
|
||||
@commit = @merge_request.last_commit
|
||||
@base_commit = @merge_request.diff_base_commit
|
||||
|
||||
|
|
Loading…
Reference in New Issue