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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
a216d424
Commit
a216d424
authored
Dec 19, 2017
by
Jarka Kadlecová
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use correct params format for epic_issue update
parent
e4996a83
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
ee/app/controllers/groups/epic_issues_controller.rb
ee/app/controllers/groups/epic_issues_controller.rb
+1
-1
spec/ee/spec/controllers/groups/epic_issues_controller_spec.rb
...ee/spec/controllers/groups/epic_issues_controller_spec.rb
+2
-2
No files found.
ee/app/controllers/groups/epic_issues_controller.rb
View file @
a216d424
...
...
@@ -9,7 +9,7 @@ class Groups::EpicIssuesController < Groups::EpicsController
before_action
:authorize_issue_link_association!
,
only:
[
:destroy
,
:update
]
def
update
result
=
EpicIssues
::
UpdateService
.
new
(
link
,
current_user
,
params
).
execute
result
=
EpicIssues
::
UpdateService
.
new
(
link
,
current_user
,
params
[
:epic
]
).
execute
render
json:
{
message:
result
[
:message
]
},
status:
result
[
:http_status
]
end
...
...
spec/ee/spec/controllers/groups/epic_issues_controller_spec.rb
View file @
a216d424
...
...
@@ -151,7 +151,7 @@ describe Groups::EpicIssuesController do
let!
(
:epic_issue2
)
{
create
(
:epic_issue
,
epic:
epic
,
issue:
issue2
,
position:
2
)
}
subject
do
put
:update
,
group_id:
group
,
epic_id:
epic
.
to_param
,
id:
epic_issue1
.
id
,
position:
1
put
:update
,
group_id:
group
,
epic_id:
epic
.
to_param
,
id:
epic_issue1
.
id
,
epic:
{
position:
1
}
end
context
'when user has permissions to admin the epic'
do
...
...
@@ -184,7 +184,7 @@ describe Groups::EpicIssuesController do
context
'when the epic from the association does not equal epic from the path'
do
subject
do
put
:update
,
group_id:
group
,
epic_id:
another_epic
.
to_param
,
id:
epic_issue1
.
id
,
position:
2
put
:update
,
group_id:
group
,
epic_id:
another_epic
.
to_param
,
id:
epic_issue1
.
id
,
epic:
{
position:
2
}
end
let
(
:another_epic
)
{
create
(
:epic
,
group:
group
)
}
...
...
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