Automatic merge of gitlab-org/gitlab master

app/helpers/commits_helper.rb

@@ -166,7 +166,7 @@ module CommitsHelper
     path = project_blob_path(project, tree_join(commit_sha, diff_new_path))
     title = replaced ? _('View replaced file @ ') : _('View file @ ')
 
-    link_to(path, class: 'btn') do
+    link_to(path, class: 'btn gl-button btn-default') do
       raw(title) + content_tag(:span, truncate_sha(commit_sha), class: 'commit-sha')
     end
   end

app/helpers/diff_helper.rb

@@ -133,7 +133,7 @@ module DiffHelper
         ].join('').html_safe
 
       tooltip = _('Compare submodule commit revisions')
-      link = content_tag(:span, link_to(link_text, compare_url, class: 'btn has-tooltip', title: tooltip), class: 'submodule-compare')
+      link = content_tag(:span, link_to(link_text, compare_url, class: 'btn gl-button has-tooltip', title: tooltip), class: 'submodule-compare')
     end
 
     link
@@ -223,7 +223,7 @@ module DiffHelper
     # Always use HTML to handle case where JSON diff rendered this button
     params_copy.delete(:format)
 
-    link_to url_for(params_copy), id: "#{name}-diff-btn", class: (selected ? 'btn active' : 'btn'), data: { view_type: name } do
+    link_to url_for(params_copy), id: "#{name}-diff-btn", class: (selected ? 'btn gl-button active' : 'btn gl-button'), data: { view_type: name } do
       title
     end
   end
@@ -252,7 +252,7 @@ module DiffHelper
   end
 
   def toggle_whitespace_link(url, options)
-    options[:class] = [*options[:class], 'btn btn-default'].join(' ')
+    options[:class] = [*options[:class], 'btn gl-button btn-default'].join(' ')
     link_to "#{hide_whitespace? ? 'Show' : 'Hide'} whitespace changes", url, class: options[:class]
   end
 

app/views/projects/commit/_commit_box.html.haml

@@ -22,13 +22,13 @@
 
   .header-action-buttons
     - if defined?(@notes_count) && @notes_count > 0
-      %span.btn.disabled.gl-button.btn-icon.d-none.d-sm-inline.gl-mr-3.has-tooltip{ title: n_("%d comment on this commit", "%d comments on this commit", @notes_count) % @notes_count }
+      %span.btn.gl-button.btn-default.disabled.gl-button.btn-icon.d-none.d-sm-inline.gl-mr-3.has-tooltip{ title: n_("%d comment on this commit", "%d comments on this commit", @notes_count) % @notes_count }
         = sprite_icon('comment')
         = @notes_count
-    = link_to project_tree_path(@project, @commit), class: "btn gl-button gl-mr-3 d-none d-md-inline" do
+    = link_to project_tree_path(@project, @commit), class: "btn gl-button btn-default gl-mr-3 d-none d-md-inline" do
       #{ _('Browse files') }
     .dropdown.inline
-      %a.btn.gl-button.dropdown-toggle.qa-options-button.d-md-inline{ data: { toggle: "dropdown" } }
+      %a.btn.gl-button.btn-default.dropdown-toggle.qa-options-button.d-md-inline{ data: { toggle: "dropdown" } }
         %span= _('Options')
         = sprite_icon('chevron-down', css_class: 'gl-text-gray-500')
       %ul.dropdown-menu.dropdown-menu-right

app/views/projects/diffs/_file.html.haml

@@ -16,7 +16,7 @@
     - unless diff_file.submodule?
       .file-actions.d-none.d-sm-block
         - if diff_file.blob&.readable_text?
-          = link_to '#', class: 'js-toggle-diff-comments gl-button btn active has-tooltip', title: _("Toggle comments for this file"), disabled: @diff_notes_disabled do
+          = link_to '#', class: 'js-toggle-diff-comments btn gl-button active has-tooltip', title: _("Toggle comments for this file"), disabled: @diff_notes_disabled do
             = sprite_icon('comment')
           \
           - if editable_diff?(diff_file)

changelogs/unreleased/gl-button-commit-page.yml

+---
+title: Apply new GitLab UI for buttons in commit page
+merge_request: 53555
+author: Yogi (@yo)
+type: other

ee/app/assets/javascripts/threat_monitoring/components/policy_editor/constants.js

@@ -33,3 +33,5 @@ export const PortMatchModePortProtocol = 'port/protocol';
 export const DisabledByLabel = 'network-policy.gitlab.com/disabled_by';
 
 export const CiliumNetworkPolicyKind = 'CiliumNetworkPolicy';
+
+export const ProjectIdLabel = 'app.gitlab.com/proj';

ee/app/assets/javascripts/threat_monitoring/components/policy_editor/lib/from_yaml.js

@@ -113,7 +113,7 @@ function parseRule(item, direction) {
 */
 export default function fromYaml(manifest) {
   const { description, metadata, spec } = safeLoad(manifest, { json: true });
-  const { name, resourceVersion, annotations } = metadata;
+  const { name, resourceVersion, annotations, labels } = metadata;
   const { endpointSelector = {}, ingress = [], egress = [] } = spec;
   const matchLabels = endpointSelector.matchLabels || {};
 
@@ -135,6 +135,7 @@ export default function fromYaml(manifest) {
     resourceVersion,
     description,
     annotations,
+    labels,
     isEnabled: !Object.keys(matchLabels).includes(DisabledByLabel),
     endpointMatchMode: endpointLabels.length > 0 ? EndpointMatchModeLabel : EndpointMatchModeAny,
     endpointLabels: endpointLabels.join(' '),

ee/app/assets/javascripts/threat_monitoring/components/policy_editor/lib/to_yaml.js

@@ -33,11 +33,14 @@ function spec({ rules, isEnabled, endpointMatchMode, endpointLabels }) {
  Return yaml representation of a policy.
 */
 export default function toYaml(policy) {
-  const { annotations, name, resourceVersion, description } = policy;
+  const { annotations, name, resourceVersion, description, labels } = policy;
   const metadata = { name };
   if (annotations) {
     metadata.annotations = annotations;
   }
+  if (labels) {
+    metadata.labels = labels;
+  }
   if (resourceVersion) {
     metadata.resourceVersion = resourceVersion;
   }

ee/app/assets/javascripts/threat_monitoring/components/policy_editor/policy_editor.vue

@@ -27,6 +27,7 @@ import {
   EditorModeYAML,
   EndpointMatchModeAny,
   RuleTypeEndpoint,
+  ProjectIdLabel,
 } from './constants';
 import toYaml from './lib/to_yaml';
 import fromYaml from './lib/from_yaml';
@@ -64,6 +65,10 @@ export default {
       required: false,
       default: null,
     },
+    projectId: {
+      type: String,
+      required: true,
+    },
   },
   data() {
     const policy = this.existingPolicy
@@ -76,8 +81,9 @@ export default {
           endpointLabels: '',
           rules: [],
           annotations: '',
+          labels: '',
         };
-
+    policy.labels = { [ProjectIdLabel]: this.projectId };
     return {
       editorMode: EditorModeRule,
       yamlEditorValue: '',

ee/app/assets/javascripts/threat_monitoring/policy_editor.js

@@ -20,6 +20,7 @@ export default () => {
     threatMonitoringPath,
     policy,
     projectPath,
+    projectId,
     environmentId,
   } = el.dataset;
 
@@ -35,7 +36,7 @@ export default () => {
     store.dispatch('threatMonitoring/setCurrentEnvironmentId', parseInt(environmentId, 10));
   }
 
-  const props = { threatMonitoringPath };
+  const props = { threatMonitoringPath, projectId };
   if (policy) {
     props.existingPolicy = JSON.parse(policy);
   }

ee/app/helpers/policy_helper.rb

@@ -23,6 +23,7 @@ module PolicyHelper
       create_agent_help_path: help_page_url('user/clusters/agent/index.md', anchor: 'create-an-agent-record-in-gitlab'),
       environments_endpoint: project_environments_path(project),
       project_path: project.full_path,
+      project_id: project.id,
       threat_monitoring_path: project_threat_monitoring_path(project)
     }
   end

ee/changelogs/unreleased/add_project_id_as_cnp_labels.yml

+---
+title: Add alert related labels to CiliumNetworkPolicies. The label will contain the
+  project id and will be applicable to both new and existing policies
+merge_request: 53401
+author:
+type: changed

ee/spec/frontend/threat_monitoring/components/policy_editor/__snapshots__/policy_editor_spec.js.snap

@@ -197,6 +197,8 @@ exports[`PolicyEditorApp component renders the policy editor layout 1`] = `
 kind: CiliumNetworkPolicy
 metadata:
   name: ''
+  labels:
+    app.gitlab.com/proj: '21'
 spec:
   endpointSelector:
     matchLabels:

ee/spec/frontend/threat_monitoring/components/policy_editor/lib/from_yaml_spec.js

@@ -20,13 +20,14 @@ describe('fromYaml', () => {
 
   const cidrExample = '20.1.1.1/32 20.1.1.2/32';
   const portExample = '80 81/udp 82/tcp';
-
+  const labels = { 'app.gitlab.com/proj': '21' };
   beforeEach(() => {
     policy = {
       name: 'test-policy',
       endpointLabels: '',
       rules: [],
       isEnabled: true,
+      labels,
     };
   });
 
@@ -37,6 +38,7 @@ describe('fromYaml', () => {
       endpointMatchMode: EndpointMatchModeAny,
       endpointLabels: '',
       rules: [],
+      labels,
     });
   });
 

ee/spec/frontend/threat_monitoring/components/policy_editor/lib/to_yaml_spec.js

@@ -139,6 +139,26 @@ spec:
   - fromEndpoints:
     - matchLabels:
         foo: bar
+`);
+    });
+  });
+
+  describe('when labels are not empty', () => {
+    beforeEach(() => {
+      policy.labels = { 'app.gitlab.com/proj': '21' };
+    });
+
+    it('returns yaml representation', () => {
+      expect(toYaml(policy)).toEqual(`apiVersion: cilium.io/v2
+kind: CiliumNetworkPolicy
+metadata:
+  name: test-policy
+  labels:
+    app.gitlab.com/proj: '21'
+spec:
+  endpointSelector:
+    matchLabels:
+      network-policy.gitlab.com/disabled_by: gitlab
 `);
     });
   });

ee/spec/frontend/threat_monitoring/components/policy_editor/policy_editor_spec.js

@@ -38,6 +38,7 @@ describe('PolicyEditorApp component', () => {
     wrapper = shallowMount(PolicyEditorApp, {
       propsData: {
         threatMonitoringPath: '/threat-monitoring',
+        projectId: '21',
         ...propsData,
       },
       provide: {
@@ -124,6 +125,8 @@ kind: CiliumNetworkPolicy
 description: test description
 metadata:
   name: test-policy
+  labels:
+    app.gitlab.com/proj: '21'
 spec:
   endpointSelector:
     matchLabels:
@@ -147,6 +150,7 @@ spec:
             matchLabels: 'foo:bar',
           },
         ],
+        labels: { 'app.gitlab.com/proj': '21' },
       });
     });
   });

ee/spec/helpers/policy_helper_spec.rb

@@ -22,6 +22,7 @@ RSpec.describe PolicyHelper do
       create_agent_help_path: kind_of(String),
       environments_endpoint: kind_of(String),
       project_path: project.full_path,
+      project_id: project.id,
       threat_monitoring_path: kind_of(String)
     }
   end

ee/spec/lib/analytics/merge_request_metrics_calculator_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe Analytics::MergeRequestMetricsCalculator do
   subject { described_class.new(merge_request) }
 
-  let_it_be(:merge_request) { create(:merge_request, :merged, :with_diffs, created_at: 31.days.ago) }
+  let_it_be(:merge_request) { create(:merge_request, :merged, created_at: 31.days.ago) }
   let_it_be(:merge_request_note) do
     create(:diff_note_on_merge_request, noteable: merge_request, project: merge_request.source_project, author: create(:user))
   end

ee/spec/lib/ee/api/entities/analytics/code_review/merge_request_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe EE::API::Entities::Analytics::CodeReview::MergeRequest do
   subject(:entity_representation) { described_class.new(merge_request).as_json }
 
   let(:merge_request) do
-    create(:merge_request, :with_diffs, :with_productivity_metrics,
+    create(:merge_request, :with_productivity_metrics,
            milestone: milestone,
            source_project: project,
            metrics_data: { first_comment_at: 1.day.ago, merged_at: 1.hour.ago }

package.json

@@ -177,9 +177,9 @@
     "docdash": "^1.0.2",
     "eslint": "7.19.0",
     "eslint-import-resolver-jest": "3.0.0",
-    "eslint-import-resolver-webpack": "0.12.1",
-    "eslint-plugin-jasmine": "4.1.0",
-    "eslint-plugin-no-jquery": "2.3.1",
+    "eslint-import-resolver-webpack": "0.13.0",
+    "eslint-plugin-jasmine": "4.1.2",
+    "eslint-plugin-no-jquery": "2.5.0",
     "gettext-extractor": "^3.4.3",
     "gettext-extractor-vue": "^4.0.2",
     "istanbul-lib-coverage": "^3.0.0",

spec/controllers/projects/merge_requests_controller_spec.rb

@@ -1371,7 +1371,6 @@ RSpec.describe Projects::MergeRequestsController do
   describe 'GET test_reports' do
     let_it_be(:merge_request) do
       create(:merge_request,
-        :with_diffs,
         :with_merge_request_pipeline,
         target_project: project,
         source_project: project
@@ -1482,7 +1481,6 @@ RSpec.describe Projects::MergeRequestsController do
   describe 'GET accessibility_reports' do
     let_it_be(:merge_request) do
       create(:merge_request,
-        :with_diffs,
         :with_merge_request_pipeline,
         target_project: project,
         source_project: project
@@ -1603,7 +1601,6 @@ RSpec.describe Projects::MergeRequestsController do
   describe 'GET codequality_reports' do
     let_it_be(:merge_request) do
       create(:merge_request,
-        :with_diffs,
         :with_merge_request_pipeline,
         target_project: project,
         source_project: project

spec/factories/merge_requests.rb

@@ -21,9 +21,6 @@ FactoryBot.define do
 
     merge_status { "can_be_merged" }
 
-    trait :with_diffs do
-    end
-
     trait :jira_title do
       title { generate(:jira_title) }
     end
@@ -306,7 +303,7 @@ FactoryBot.define do
     factory :closed_merge_request, traits: [:closed]
     factory :reopened_merge_request, traits: [:opened]
     factory :invalid_merge_request, traits: [:invalid]
-    factory :merge_request_with_diffs, traits: [:with_diffs]
+    factory :merge_request_with_diffs
     factory :merge_request_with_diff_notes do
       after(:create) do |mr|
         create(:diff_note_on_merge_request, noteable: mr, project: mr.source_project)

spec/features/ide/user_opens_merge_request_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe 'IDE merge request', :js do
-  let(:merge_request) { create(:merge_request, :with_diffs, :simple, source_project: project) }
+  let(:merge_request) { create(:merge_request, :simple, source_project: project) }
   let(:project) { create(:project, :public, :repository) }
   let(:user) { project.owner }
 

spec/features/merge_request/user_accepts_merge_request_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe 'User accepts a merge request', :js, :sidekiq_might_not_need_inline do
-  let(:merge_request) { create(:merge_request, :with_diffs, :simple, source_project: project) }
+  let(:merge_request) { create(:merge_request, :simple, source_project: project) }
   let(:project) { create(:project, :public, :repository) }
   let(:user) { create(:user) }
 

spec/features/merge_request/user_reverts_merge_request_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe 'User reverts a merge request', :js do
-  let(:merge_request) { create(:merge_request, :with_diffs, :simple, source_project: project) }
+  let(:merge_request) { create(:merge_request, :simple, source_project: project) }
   let(:project) { create(:project, :public, :repository) }
   let(:user) { create(:user) }
 

spec/features/merge_requests/user_filters_by_milestones_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe 'Merge Requests > User filters by milestones', :js do
   let(:milestone) { create(:milestone, project: project) }
 
   before do
-    create(:merge_request, :with_diffs, source_project: project)
+    create(:merge_request, source_project: project)
     create(:merge_request, :simple, source_project: project, milestone: milestone)
 
     sign_in(user)

spec/features/projects/issuable_templates_spec.rb

@@ -95,7 +95,7 @@ RSpec.describe 'issuable templates', :js do
     let(:bug_template_content) { 'this is merge request bug template' }
     let(:template_override_warning) { 'Applying a template will replace the existing issue description.' }
     let(:updated_description) { 'updated merge request description' }
-    let(:merge_request) { create(:merge_request, :with_diffs, source_project: project) }
+    let(:merge_request) { create(:merge_request, source_project: project) }
 
     before do
       project.repository.create_file(
@@ -154,7 +154,7 @@ RSpec.describe 'issuable templates', :js do
     let(:template_content) { 'this is a test "feature-proposal" template' }
     let(:fork_user) { create(:user) }
     let(:forked_project) { fork_project(project, fork_user, repository: true) }
-    let(:merge_request) { create(:merge_request, :with_diffs, source_project: forked_project, target_project: project) }
+    let(:merge_request) { create(:merge_request, source_project: forked_project, target_project: project) }
 
     before do
       sign_out(:user)

spec/frontend/fixtures/merge_requests.rb

@@ -22,7 +22,6 @@ RSpec.describe Projects::MergeRequestsController, '(JavaScript fixtures)', type:
   let(:merge_request) do
     create(
       :merge_request,
-      :with_diffs,
       source_project: project,
       target_project: project,
       description: description

spec/frontend/fixtures/merge_requests_diffs.rb

@@ -8,7 +8,7 @@ RSpec.describe Projects::MergeRequests::DiffsController, '(JavaScript fixtures)'
   let(:namespace) { create(:namespace, name: 'frontend-fixtures' )}
   let(:project) { create(:project, :repository, namespace: namespace, path: 'merge-requests-project') }
   let(:user) { project.owner }
-  let(:merge_request) { create(:merge_request, :with_diffs, source_project: project, target_project: project, description: '- [ ] Task List Item') }
+  let(:merge_request) { create(:merge_request, source_project: project, target_project: project, description: '- [ ] Task List Item') }
   let(:path) { "files/ruby/popen.rb" }
   let(:position) do
     build(:text_diff_position, :added,

spec/lib/api/entities/merge_request_basic_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe ::API::Entities::MergeRequestBasic do
   let_it_be(:project) { create(:project, :public) }
   let_it_be(:merge_request) { create(:merge_request) }
   let_it_be(:labels) { create_list(:label, 3) }
-  let_it_be(:merge_requests) { create_list(:labeled_merge_request, 10, :unique_branches, :with_diffs, labels: labels) }
+  let_it_be(:merge_requests) { create_list(:labeled_merge_request, 10, :unique_branches, labels: labels) }
 
   # This mimics the behavior of the `Grape::Entity` serializer
   def present(obj)

spec/lib/banzai/filter/merge_request_reference_filter_spec.rb

@@ -216,7 +216,7 @@ RSpec.describe Banzai::Filter::MergeRequestReferenceFilter do
   end
 
   context 'URL reference for a commit' do
-    let(:mr) { create(:merge_request, :with_diffs) }
+    let(:mr) { create(:merge_request) }
     let(:reference) do
       urls.project_merge_request_url(mr.project, mr) + "/diffs?commit_id=#{mr.diff_head_sha}"
     end

spec/models/merge_request_diff_spec.rb

@@ -80,7 +80,7 @@ RSpec.describe MergeRequestDiff do
   describe '.by_commit_sha' do
     subject(:by_commit_sha) { described_class.by_commit_sha(sha) }
 
-    let!(:merge_request) { create(:merge_request, :with_diffs) }
+    let!(:merge_request) { create(:merge_request) }
 
     context 'with sha contained in' do
       let(:sha) { 'b83d6e391c22777fca1ed3012fce84f633d7fed0' }
@@ -358,7 +358,7 @@ RSpec.describe MergeRequestDiff do
   end
 
   describe '#latest?' do
-    let!(:mr) { create(:merge_request, :with_diffs) }
+    let!(:mr) { create(:merge_request) }
     let!(:first_diff) { mr.merge_request_diff }
     let!(:last_diff) { mr.create_merge_request_diff }
 
@@ -367,7 +367,7 @@ RSpec.describe MergeRequestDiff do
   end
 
   shared_examples_for 'merge request diffs' do
-    let(:merge_request) { create(:merge_request, :with_diffs) }
+    let(:merge_request) { create(:merge_request) }
     let!(:diff) { merge_request.merge_request_diff.reload }
 
     context 'when it was not cleaned by the system' do

spec/models/merge_request_spec.rb

@@ -365,7 +365,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
   describe '.by_commit_sha' do
     subject(:by_commit_sha) { described_class.by_commit_sha(sha) }
 
-    let!(:merge_request) { create(:merge_request, :with_diffs) }
+    let!(:merge_request) { create(:merge_request) }
 
     context 'with sha contained in latest merge request diff' do
       let(:sha) { 'b83d6e391c22777fca1ed3012fce84f633d7fed0' }
@@ -431,7 +431,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
     end
 
     context 'when commit is a part of the merge request' do
-      let!(:merge_request) { create(:merge_request, :with_diffs) }
+      let!(:merge_request) { create(:merge_request) }
       let(:sha) { 'b83d6e391c22777fca1ed3012fce84f633d7fed0' }
 
       it { is_expected.to eq([merge_request]) }
@@ -451,7 +451,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
     end
 
     context 'when commit is part of the merge request and a squash commit at the same time' do
-      let!(:merge_request) { create(:merge_request, :with_diffs) }
+      let!(:merge_request) { create(:merge_request) }
       let(:sha) { merge_request.commits.first.id }
 
       before do
@@ -825,7 +825,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
     let(:last_branch_commit) { subject.source_project.repository.commit(Gitlab::Git::BRANCH_REF_PREFIX + subject.source_branch) }
 
     context 'with diffs' do
-      subject { create(:merge_request, :with_diffs) }
+      subject { create(:merge_request) }
 
       it 'returns the sha of the source branch last commit' do
         expect(subject.source_branch_sha).to eq(last_branch_commit.sha)
@@ -892,7 +892,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
     let(:options) { { paths: ['a/b', 'b/a', 'c/*'] } }
 
     context 'when there are MR diffs' do
-      let(:merge_request) { create(:merge_request, :with_diffs) }
+      let(:merge_request) { create(:merge_request) }
 
       it 'delegates to the MR diffs' do
         expect(merge_request.merge_request_diff).to receive(:raw_diffs).with(options)
@@ -941,7 +941,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
 
   describe '#note_positions_for_paths' do
     let(:user) { create(:user) }
-    let(:merge_request) { create(:merge_request, :with_diffs) }
+    let(:merge_request) { create(:merge_request) }
     let(:project) { merge_request.project }
     let!(:diff_note) do
       create(:diff_note_on_merge_request, project: project, noteable: merge_request)

spec/requests/api/graphql/mutations/notes/update/image_diff_note_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe 'Updating an image DiffNote' do
   include GraphqlHelpers
   using RSpec::Parameterized::TableSyntax
 
-  let_it_be(:noteable) { create(:merge_request, :with_diffs) }
+  let_it_be(:noteable) { create(:merge_request) }
   let_it_be(:original_body) { 'Original body' }
   let_it_be(:original_position) do
     Gitlab::Diff::Position.new(

spec/requests/api/graphql/project/merge_request/pipelines_spec.rb

@@ -8,9 +8,11 @@ RSpec.describe 'Query.project.mergeRequests.pipelines' do
   let_it_be(:project) { create(:project, :public, :repository) }
   let_it_be(:author) { create(:user) }
   let_it_be(:merge_requests) do
-    %i[with_diffs with_image_diffs conflict].map do |trait|
-      create(:merge_request, trait, author: author, source_project: project)
-    end
+    [
+      create(:merge_request, author: author, source_project: project),
+      create(:merge_request, :with_image_diffs, author: author, source_project: project),
+      create(:merge_request, :conflict, author: author, source_project: project)
+    ]
   end
 
   describe '.count' do

spec/serializers/paginated_diff_entity_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe PaginatedDiffEntity do
   let(:user) { create(:user) }
   let(:request) { double('request', current_user: user) }
-  let(:merge_request) { create(:merge_request, :with_diffs) }
+  let(:merge_request) { create(:merge_request) }
   let(:diff_batch) { merge_request.merge_request_diff.diffs_in_batch(2, 3, diff_options: nil) }
   let(:options) do
     {

yarn.lock

@@ -4604,10 +4604,10 @@ eslint-import-resolver-node@^0.3.4:
     debug "^2.6.9"
     resolve "^1.13.1"
 
-eslint-import-resolver-webpack@0.12.1:
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.12.1.tgz#771ae561e887ca4e53ee87605fbb36c5e290b0f5"
-  integrity sha512-O/sUAXk6GWrICiN8JUkkjdt9uZpqZHP+FVnTxtEILL6EZMaPSrnP4lGPSFwcKsv7O211maqq4Nz60+dh236hVg==
+eslint-import-resolver-webpack@0.13.0:
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.13.0.tgz#5cb19cf4b6996c8a2514aeb10f909e2c70488dc3"
+  integrity sha512-hZWGcmjaJZK/WSCYGI/y4+FMGQZT+cwW/1E/P4rDwFj2PbanlQHISViw4ccDJ+2wxAqjgwBfxwy3seABbVKDEw==
   dependencies:
     array-find "^1.0.0"
     debug "^2.6.9"
@@ -4664,10 +4664,10 @@ eslint-plugin-import@^2.22.1:
     resolve "^1.17.0"
     tsconfig-paths "^3.9.0"
 
-eslint-plugin-jasmine@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jasmine/-/eslint-plugin-jasmine-4.1.0.tgz#4f6d41b1a8622348c97559cbcd29badffa74dbfa"
-  integrity sha512-Vfuk2Sm1ULR7MqGjVIOOEdQWyoFBfSwvwUeo9MrajVGJB3C24c9Mmj1Cgf8Qwmf3aS2bezPt1sckpKXWpd74Dw==
+eslint-plugin-jasmine@4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jasmine/-/eslint-plugin-jasmine-4.1.2.tgz#50cc20d603b02b37727f8d174d4b83b9b8ef25a5"
+  integrity sha512-Jr52EBi6Ql5WVDvRCKBID9kRD6/CaObvCWmgHpqobczX2Mzt8/QMu9vpgx6q/O5jyQ9CIGrKaEbPuEfHRf8guw==
 
 eslint-plugin-jest@^23.8.2:
   version "23.8.2"
@@ -4676,10 +4676,10 @@ eslint-plugin-jest@^23.8.2:
   dependencies:
     "@typescript-eslint/experimental-utils" "^2.5.0"
 
-eslint-plugin-no-jquery@2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.3.1.tgz#1c364cb863a38cc1570c8020155b6004cca62178"
-  integrity sha512-/fiQUBSOMUETnfBuiK5ewvtRbek1IRTy5ov/6RZ6nlybvZ337vyGaNPWM1KgaIoIeN7dairNrPfq0h7A0tpT3A==
+eslint-plugin-no-jquery@2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.5.0.tgz#6c12e3aae172bfd3363b7ac8c3f3e944704867f4"
+  integrity sha512-RrQ380mUJJKdjgpQ/tZAJ3B3W1n3LbVmULooS2Pv5pUDcc5uVHVSJMTdUlsbvQyfo6hWP2LJ4FbOoDzENWcF7A==
 
 eslint-plugin-promise@^4.2.1:
   version "4.2.1"