Merge branch 'ce-to-ee-2018-10-26' into 'master'

CE upstream - 2018-10-26 10:21 UTC

See merge request gitlab-org/gitlab-ee!8101

app/services/resource_events/merge_into_notes_service.rb

@@ -34,7 +34,7 @@ def label_notes
     def label_events_by_discussion_id
       return [] unless resource.respond_to?(:resource_label_events)
 
-      events = resource.resource_label_events.includes(:label, :user)
+      events = resource.resource_label_events.includes(:label, user: :status)
       events = since_fetch_at(events)
 
       events.group_by { |event| event.discussion_id }

changelogs/unreleased/bvl-preload-user-status-for-events.yml

+---
+title: Show user status for label events in system notes
+merge_request: 22609
+author:
+type: fixed

spec/features/issues/resource_label_events_spec.rb

@@ -7,6 +7,7 @@
   let(:project)  { create(:project, :public) }
   let(:issue)    { create(:issue, project: project, author: user) }
   let!(:label)    { create(:label, project: project, title: 'foo') }
+  let!(:user_status) { create(:user_status, user: user) }
 
   context 'when user displays the issue' do
     let!(:note)     { create(:note_on_issue, author: user, project: project, noteable: issue, note: 'some note') }
@@ -23,6 +24,12 @@
         expect(find("#note_#{event.discussion_id}")).to have_content 'added foo label'
       end
     end
+
+    it 'shows the user status on the system note for the label' do
+      page.within("#note_#{event.discussion_id}") do
+        expect(page).to show_user_status user_status
+      end
+    end
   end
 
   context 'when user adds label to the issue' do

spec/services/resource_events/merge_into_notes_service_spec.rb

@@ -66,5 +66,14 @@ def create_note(params)
       expect(notes.count).to eq 1
       expect(notes.first.discussion_id).to eq event.discussion_id
     end
+
+    it "preloads the note author's status" do
+      event = create_event(created_at: time)
+      create(:user_status, user: event.user)
+
+      notes = described_class.new(resource, user).execute
+
+      expect(notes.first.author.association(:status)).to be_loaded
+    end
   end
 end