summaryrefslogtreecommitdiff
path: root/app/controllers/projects/merge_requests_controller.rb
diff options
context:
space:
mode:
authorRubén Dávila <ruben@gitlab.com>2019-02-05 09:55:31 -0500
committerRubén Dávila <ruben@gitlab.com>2019-02-05 09:55:31 -0500
commit24226b9fe25ad98b279eae6b3ccd37749ba4d60d (patch)
tree29daa7422ca445c4c172d7c94509da96ff87bedc /app/controllers/projects/merge_requests_controller.rb
parent4b07f22d93de1417ab7918ffd982e35526b50c6e (diff)
downloadgitlab-ce-24226b9fe25ad98b279eae6b3ccd37749ba4d60d.tar.gz
Update last_activity_on for Users on some main GET endpoints
In order to have an accurate date about the last activity of a User we need to update the last_activity_on field when the User is visiting some basic pages of GitLab like pages related to Dashboards, Projects, Issues and Merge Requests
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
-rw-r--r--app/controllers/projects/merge_requests_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index bc0a3d3526d..7c4dc95529a 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -7,6 +7,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
include RendersCommits
include ToggleAwardEmoji
include IssuableCollections
+ include RecordUserLastActivity
skip_before_action :merge_request, only: [:index, :bulk_update]
before_action :whitelist_query_limiting, only: [:assign_related_issues, :update]