diff options
author | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-07-16 18:18:52 +0200 |
---|---|---|
committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-07-30 15:01:26 +0200 |
commit | f1d3ea63cf74d2791a9a863b29ab2d919ea61bd0 (patch) | |
tree | c36c2b272fba917af321a4f16c34a5047407f3b2 /app/controllers | |
parent | b4c4b48a8c0258ff266c523488aa169a1b5ea0f3 (diff) | |
download | gitlab-ce-f1d3ea63cf74d2791a9a863b29ab2d919ea61bd0.tar.gz |
Show the status of a user in interactions
The status is shown for
- The author of a commit when viewing a commit
- Notes on a commit (regular/diff)
- The user that triggered a pipeline when viewing a pipeline
- The author of a merge request when viewing a merge request
- The author of notes on a merge request (regular/diff)
- The author of an issue when viewing an issue
- The author of notes on an issue
- The author of a snippet when viewing a snippet
- The author of notes on a snippet
- A user's profile page
- The list of members of a group/user
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/concerns/members_presentation.rb | 8 | ||||
-rw-r--r-- | app/controllers/concerns/membership_actions.rb | 2 | ||||
-rw-r--r-- | app/controllers/concerns/notes_actions.rb | 4 | ||||
-rw-r--r-- | app/controllers/concerns/renders_notes.rb | 5 | ||||
-rw-r--r-- | app/controllers/groups/group_members_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/projects/commit_controller.rb | 9 | ||||
-rw-r--r-- | app/controllers/projects/issues_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/projects/merge_requests/application_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/projects/notes_controller.rb | 3 | ||||
-rw-r--r-- | app/controllers/projects/pipelines_controller.rb | 6 | ||||
-rw-r--r-- | app/controllers/projects/snippets_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/snippets/notes_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/snippets_controller.rb | 2 |
13 files changed, 37 insertions, 12 deletions
diff --git a/app/controllers/concerns/members_presentation.rb b/app/controllers/concerns/members_presentation.rb index c0622516fd3..215e0bdf3cb 100644 --- a/app/controllers/concerns/members_presentation.rb +++ b/app/controllers/concerns/members_presentation.rb @@ -2,10 +2,18 @@ module MembersPresentation extend ActiveSupport::Concern def present_members(members) + preload_associations(members) Gitlab::View::Presenter::Factory.new( members, current_user: current_user, presenter_class: MembersPresenter ).fabricate! end + + def preload_associations(members) + ActiveRecord::Associations::Preloader.new.preload(members, :user) + ActiveRecord::Associations::Preloader.new.preload(members, :source) + ActiveRecord::Associations::Preloader.new.preload(members.map(&:user), :status) + ActiveRecord::Associations::Preloader.new.preload(members.map(&:user), :u2f_registrations) + end end diff --git a/app/controllers/concerns/membership_actions.rb b/app/controllers/concerns/membership_actions.rb index 7a6a00b8e13..409e6d4c4d2 100644 --- a/app/controllers/concerns/membership_actions.rb +++ b/app/controllers/concerns/membership_actions.rb @@ -1,4 +1,5 @@ module MembershipActions + include MembersPresentation extend ActiveSupport::Concern def create @@ -20,6 +21,7 @@ module MembershipActions .execute(member) .present(current_user: current_user) + present_members([member]) respond_to do |format| format.js { render 'shared/members/update', locals: { member: member } } end diff --git a/app/controllers/concerns/notes_actions.rb b/app/controllers/concerns/notes_actions.rb index fe9a030cdf2..5127db3f5fb 100644 --- a/app/controllers/concerns/notes_actions.rb +++ b/app/controllers/concerns/notes_actions.rb @@ -41,7 +41,7 @@ module NotesActions @note = Notes::CreateService.new(note_project, current_user, create_params).execute if @note.is_a?(Note) - Notes::RenderService.new(current_user).execute([@note]) + prepare_notes_for_rendering([@note], noteable) end respond_to do |format| @@ -56,7 +56,7 @@ module NotesActions @note = Notes::UpdateService.new(project, current_user, note_params).execute(note) if @note.is_a?(Note) - Notes::RenderService.new(current_user).execute([@note]) + prepare_notes_for_rendering([@note]) end respond_to do |format| diff --git a/app/controllers/concerns/renders_notes.rb b/app/controllers/concerns/renders_notes.rb index 36e3d76ecfe..cf04023080a 100644 --- a/app/controllers/concerns/renders_notes.rb +++ b/app/controllers/concerns/renders_notes.rb @@ -4,6 +4,7 @@ module RendersNotes preload_noteable_for_regular_notes(notes) preload_max_access_for_authors(notes, @project) preload_first_time_contribution_for_authors(noteable, notes) + preload_author_status(notes) Notes::RenderService.new(current_user).execute(notes) notes @@ -28,4 +29,8 @@ module RendersNotes notes.each {|n| n.specialize_for_first_contribution!(noteable)} end + + def preload_author_status(notes) + ActiveRecord::Associations::Preloader.new.preload(notes, { author: :status }) + end end diff --git a/app/controllers/groups/group_members_controller.rb b/app/controllers/groups/group_members_controller.rb index ef5d5e5c742..7dc51f4c357 100644 --- a/app/controllers/groups/group_members_controller.rb +++ b/app/controllers/groups/group_members_controller.rb @@ -30,7 +30,7 @@ class Groups::GroupMembersController < Groups::ApplicationController end @members = @members.page(params[:page]).per(50) - @members = present_members(@members.includes(:user)) + @members = present_members(@members) @requesters = present_members( AccessRequestsFinder.new(@group).execute(current_user)) diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index 1d1184d46d1..44b176d304e 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -22,7 +22,9 @@ class Projects::CommitController < Projects::ApplicationController apply_diff_view_cookie! respond_to do |format| - format.html { render } + format.html do + render + end format.diff do send_git_diff(@project.repository, @commit.diff_refs) end @@ -124,7 +126,10 @@ class Projects::CommitController < Projects::ApplicationController end def commit - @noteable = @commit ||= @project.commit_by(oid: params[:id]) + @noteable = @commit ||= @project.commit_by(oid: params[:id]).tap do |commit| + # preload author and their status for rendering + commit&.author&.status + end end def define_commit_vars diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 7c897b2d86c..ef8159aa553 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -165,7 +165,7 @@ class Projects::IssuesController < Projects::ApplicationController return @issue if defined?(@issue) # The Sortable default scope causes performance issues when used with find_by - @issuable = @noteable = @issue ||= @project.issues.where(iid: params[:id]).reorder(nil).take! + @issuable = @noteable = @issue ||= @project.issues.includes(author: :status).where(iid: params[:id]).reorder(nil).take! @note = @project.notes.new(noteable: @issuable) return render_404 unless can?(current_user, :read_issue, @issue) diff --git a/app/controllers/projects/merge_requests/application_controller.rb b/app/controllers/projects/merge_requests/application_controller.rb index 8e4aeec16dc..fead81dd472 100644 --- a/app/controllers/projects/merge_requests/application_controller.rb +++ b/app/controllers/projects/merge_requests/application_controller.rb @@ -6,7 +6,7 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont private def merge_request - @issuable = @merge_request ||= @project.merge_requests.find_by!(iid: params[:id]) + @issuable = @merge_request ||= @project.merge_requests.includes(author: :status).find_by!(iid: params[:id]) end def merge_request_params diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index 4d4c2af2415..21e2145b73b 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -1,4 +1,5 @@ class Projects::NotesController < Projects::ApplicationController + include RendersNotes include NotesActions include NotesHelper include ToggleAwardEmoji @@ -53,7 +54,7 @@ class Projects::NotesController < Projects::ApplicationController private def render_json_with_notes_serializer - Notes::RenderService.new(current_user).execute([note]) + prepare_notes_for_rendering([note]) render json: note_serializer.represent(note) end diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb index 45cef123c34..1d5d1ee5d5a 100644 --- a/app/controllers/projects/pipelines_controller.rb +++ b/app/controllers/projects/pipelines_controller.rb @@ -161,7 +161,11 @@ class Projects::PipelinesController < Projects::ApplicationController end def pipeline - @pipeline ||= project.pipelines.find_by!(id: params[:id]).present(current_user: current_user) + @pipeline ||= project + .pipelines + .includes(user: :status) + .find_by!(id: params[:id]) + .present(current_user: current_user) end def commit diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb index f742d7edf83..7c03d8ce827 100644 --- a/app/controllers/projects/snippets_controller.rb +++ b/app/controllers/projects/snippets_controller.rb @@ -88,7 +88,7 @@ class Projects::SnippetsController < Projects::ApplicationController protected def snippet - @snippet ||= @project.snippets.find(params[:id]) + @snippet ||= @project.snippets.inc_relations_for_view.find(params[:id]) end alias_method :awardable, :snippet alias_method :spammable, :snippet diff --git a/app/controllers/snippets/notes_controller.rb b/app/controllers/snippets/notes_controller.rb index c8b4682e6dc..217da89a1fd 100644 --- a/app/controllers/snippets/notes_controller.rb +++ b/app/controllers/snippets/notes_controller.rb @@ -9,7 +9,7 @@ class Snippets::NotesController < ApplicationController private def note - @note ||= snippet.notes.find(params[:id]) + @note ||= snippet.notes.inc_relations_for_view.find(params[:id]) end alias_method :awardable, :note diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb index 1d6d0943674..dcf18c1f751 100644 --- a/app/controllers/snippets_controller.rb +++ b/app/controllers/snippets_controller.rb @@ -95,7 +95,7 @@ class SnippetsController < ApplicationController protected def snippet - @snippet ||= PersonalSnippet.find_by(id: params[:id]) + @snippet ||= PersonalSnippet.inc_relations_for_view.find_by(id: params[:id]) end alias_method :awardable, :snippet |