diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-08-28 10:08:29 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-08-28 10:08:29 +0000 |
| commit | c3e01c7b7b79b61752047454ae103bc23321615a (patch) | |
| tree | 0e61df998b2dc048ed8533d8f3d9b80601285cbb | |
| parent | 3b9eb5631fa17bbf525b5e869d8e36665638cd5a (diff) | |
| parent | 83739b8b4303449ee810993b484bff382c378cba (diff) | |
| download | gitlab-ce-c3e01c7b7b79b61752047454ae103bc23321615a.tar.gz | |
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
| -rw-r--r-- | changelogs/unreleased/rails5-fix-import-merge-request-creator.yml | 5 | ||||
| -rw-r--r-- | spec/lib/gitlab/import/merge_request_creator_spec.rb | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changelogs/unreleased/rails5-fix-import-merge-request-creator.yml b/changelogs/unreleased/rails5-fix-import-merge-request-creator.yml new file mode 100644 index 00000000000..661bd748333 --- /dev/null +++ b/changelogs/unreleased/rails5-fix-import-merge-request-creator.yml @@ -0,0 +1,5 @@ +--- +title: 'Rails5: fix can''t quote ActiveSupport::HashWithIndifferentAccess' +merge_request: 21397 +author: Jasper Maes +type: other diff --git a/spec/lib/gitlab/import/merge_request_creator_spec.rb b/spec/lib/gitlab/import/merge_request_creator_spec.rb index cd3359da341..7c73e9b39f7 100644 --- a/spec/lib/gitlab/import/merge_request_creator_spec.rb +++ b/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) |