Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
83739b8b
Commit
83739b8b
authored
Aug 27, 2018
by
Jasper Maes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rails5: fix can't quote ActiveSupport::HashWithIndifferentAccess
parent
881ba3f5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
changelogs/unreleased/rails5-fix-import-merge-request-creator.yml
...gs/unreleased/rails5-fix-import-merge-request-creator.yml
+5
-0
spec/lib/gitlab/import/merge_request_creator_spec.rb
spec/lib/gitlab/import/merge_request_creator_spec.rb
+2
-2
No files found.
changelogs/unreleased/rails5-fix-import-merge-request-creator.yml
0 → 100644
View file @
83739b8b
---
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
View file @
83739b8b
...
@@ -11,7 +11,7 @@ describe Gitlab::Import::MergeRequestCreator do
...
@@ -11,7 +11,7 @@ describe Gitlab::Import::MergeRequestCreator do
context
'merge request already exists'
do
context
'merge request already exists'
do
let
(
:merge_request
)
{
create
(
:merge_request
,
target_project:
project
,
source_project:
project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
target_project:
project
,
source_project:
project
)
}
let
(
:commits
)
{
merge_request
.
merge_request_diffs
.
first
.
commits
}
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
it
'updates the data'
do
commits_count
=
commits
.
count
commits_count
=
commits
.
count
...
@@ -28,7 +28,7 @@ describe Gitlab::Import::MergeRequestCreator do
...
@@ -28,7 +28,7 @@ describe Gitlab::Import::MergeRequestCreator do
context
'new merge request'
do
context
'new merge request'
do
let
(
:merge_request
)
{
build
(
:merge_request
,
target_project:
project
,
source_project:
project
)
}
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
it
'creates a new merge request'
do
attributes
.
delete
(
:id
)
attributes
.
delete
(
:id
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment