Commit d837fee6 authored by Luke Bennett's avatar Luke Bennett
Browse files

Resolve create_new_mr_spec.rb

parent 8c78d6b9
Loading
Loading
Loading
Loading
Loading
+0 −3
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@
    expect(target_items.count).to be > 1
  end

<<<<<<< HEAD
  context 'when approvals are disabled for the target project' do
    it 'does not show approval settings' do
      visit project_new_merge_request_path(project, merge_request: { target_branch: 'master', source_branch: 'feature_conflict' })
@@ -119,8 +118,6 @@
    end
  end

=======
>>>>>>> ce-com/master
  context 'when target project cannot be viewed by the current user' do
    it 'does not leak the private project name & namespace' do
      private_project = create(:project, :private, :repository)