diff options
author | Ruben Davila <rdavila84@gmail.com> | 2016-08-18 07:33:27 -0500 |
---|---|---|
committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-18 07:33:27 -0500 |
commit | 22ce76d447407024d9bd58eedce6c166eb7b6eb2 (patch) | |
tree | e4859077bb96e4fc2f29f5022ebbadbb7fe6e6d3 /app/controllers | |
parent | bac19f4c5c62218f7c59894957548a25b03f69d5 (diff) | |
download | gitlab-ce-22ce76d447407024d9bd58eedce6c166eb7b6eb2.tar.gz |
Refactor to mark Changes tab as active on new MR page.
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects/application_controller.rb | 1 | ||||
-rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb index 996909a28c6..91315a07deb 100644 --- a/app/controllers/projects/application_controller.rb +++ b/app/controllers/projects/application_controller.rb @@ -83,6 +83,7 @@ class Projects::ApplicationController < ApplicationController end def apply_diff_view_cookie! + @show_changes_tab = params[:view].present? cookies.permanent[:diff_view] = params.delete(:view) if params[:view].present? end diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 696f7192131..4c1f38be9f3 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -216,7 +216,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController @base_commit = @merge_request.diff_base_commit @diffs = @merge_request.diffs(diff_options) if @merge_request.compare @diff_notes_disabled = true - @show_diff_tab = check_diff_tab @pipeline = @merge_request.pipeline @statuses = @pipeline.statuses.relevant if @pipeline @@ -520,10 +519,4 @@ class Projects::MergeRequestsController < Projects::ApplicationController params[:merge_request] ||= ActionController::Parameters.new(source_project: @project) @merge_request = MergeRequests::BuildService.new(project, current_user, merge_request_params).execute end - - private - - def check_diff_tab - request.query_parameters[:view].present? - end end |