Merge branch 'rails5-fix-import-merge-request-creator' into 'master'

Rails5: fix can't quote ActiveSupport::HashWithIndifferentAccess

See merge request gitlab-org/gitlab-ce!21397

changelogs/unreleased/rails5-fix-import-merge-request-creator.yml

+---
+title: 'Rails5: fix can''t quote ActiveSupport::HashWithIndifferentAccess'
+merge_request: 21397
+author: Jasper Maes
+type: other

spec/lib/gitlab/import/merge_request_creator_spec.rb

@@ -11,7 +11,7 @@ describe Gitlab::Import::MergeRequestCreator do
     context 'merge request already exists' do
       let(:merge_request) { create(:merge_request, target_project: project, source_project: project) }
       let(:commits) { merge_request.merge_request_diffs.first.commits }
-      let(:attributes) { HashWithIndifferentAccess.new(merge_request.attributes) }
+      let(:attributes) { HashWithIndifferentAccess.new(merge_request.attributes.except("merge_params")) }
 
       it 'updates the data' do
         commits_count = commits.count
@@ -28,7 +28,7 @@ describe Gitlab::Import::MergeRequestCreator do
 
     context 'new merge request' do
       let(:merge_request) { build(:merge_request, target_project: project, source_project: project) }
-      let(:attributes) { HashWithIndifferentAccess.new(merge_request.attributes) }
+      let(:attributes) { HashWithIndifferentAccess.new(merge_request.attributes.except("merge_params")) }
 
       it 'creates a new merge request' do
         attributes.delete(:id)