Add latest changes from gitlab-org/gitlab@master

spec/requests/api/issues/post_projects_issues_spec.rb

@@ -160,6 +160,16 @@ describe API::Issues do
           expect(json_response['iid']).not_to eq 9001
         end
       end
+
+      context 'when an issue with the same IID exists on database' do
+        it 'returns 409' do
+          post api("/projects/#{project.id}/issues", admin),
+            params: { title: 'new issue', iid: issue.iid }
+
+          expect(response).to have_gitlab_http_status(409)
+          expect(json_response['message']).to eq 'Duplicated issue'
+        end
+      end
     end
     it 'creates a new project issue' do

spec/services/users/destroy_service_spec.rb

@@ -20,6 +20,22 @@ describe Users::DestroyService do
         expect { Namespace.find(namespace.id) }.to raise_error(ActiveRecord::RecordNotFound)
       end
+      it 'deletes user associations in batches' do
+        expect(user).to receive(:destroy_dependent_associations_in_batches)
+
+        service.execute(user)
+      end
+
+      context 'when :destroy_user_associations_in_batches flag is disabled' do
+        it 'does not delete user associations in batches' do
+          stub_feature_flags(destroy_user_associations_in_batches: false)
+
+          expect(user).not_to receive(:destroy_dependent_associations_in_batches)
+
+          service.execute(user)
+        end
+      end
+
       it 'will delete the project' do
         expect_next_instance_of(Projects::DestroyService) do |destroy_service|
           expect(destroy_service).to receive(:execute).once.and_return(true)

spec/support/matchers/eq_uri.rb

+# frozen_string_literal: true
+
+# Assert the result matches a URI object initialized with the expectation variable.
+#
+# Success:
+# ```
+# expect(URI('www.fish.com')).to eq_uri('www.fish.com')
+# ```
+#
+# Failure:
+# ```
+# expect(URI('www.fish.com')).to eq_uri('www.dog.com')
+# ```
+#
+RSpec::Matchers.define :eq_uri do |expected|
+  match do |actual|
+    actual == URI(expected)
+  end
+end