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
b0a9a7cf
Commit
b0a9a7cf
authored
May 04, 2017
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Multiple issue assignee]: reslving some conflicts
parent
387c4b2c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
2 additions
and
47 deletions
+2
-47
lib/api/v3/issues.rb
lib/api/v3/issues.rb
+0
-4
spec/fixtures/api/schemas/issue.json
spec/fixtures/api/schemas/issue.json
+1
-3
spec/requests/api/issues_spec.rb
spec/requests/api/issues_spec.rb
+0
-8
spec/requests/api/v3/issues_spec.rb
spec/requests/api/v3/issues_spec.rb
+1
-12
spec/services/slash_commands/interpret_service_spec.rb
spec/services/slash_commands/interpret_service_spec.rb
+0
-20
No files found.
lib/api/v3/issues.rb
View file @
b0a9a7cf
...
...
@@ -61,12 +61,8 @@ module API
end
get
do
issues
=
find_issues
(
scope:
'authored'
)
<<<<<<<
HEAD
present
paginate
(
issues
),
with:
::
API
::
Entities
::
Issue
,
current_user:
current_user
=======
present
paginate
(
issues
),
with:
::
API
::
V3
::
Entities
::
Issue
,
current_user:
current_user
>>>>>>>
b0a2435
...
Merge
branch
'multiple_assignees_review_upstream'
into
ee_master
end
end
...
...
spec/fixtures/api/schemas/issue.json
View file @
b0a9a7cf
...
...
@@ -40,13 +40,12 @@
"additionalProperties"
:
false
}
},
<<<<<<<
HEAD
"assignee"
:
{
"id"
:
{
"type"
:
"integet"
},
"name"
:
{
"type"
:
"string"
},
"username"
:
{
"type"
:
"string"
},
"avatar_url"
:
{
"type"
:
"uri"
}
=======
},
"assignees"
:
{
"type"
:
"array"
,
"items"
:
{
...
...
@@ -64,7 +63,6 @@
"avatar_url"
:
{
"type"
:
"uri"
}
}
}
>>>>>>>
b
0
a
2435
...
Merge
branch
'multiple_assignees_review_upstream'
into
ee_master
},
"subscribed"
:
{
"type"
:
[
"boolean"
,
"null"
]
}
},
...
...
spec/requests/api/issues_spec.rb
View file @
b0a9a7cf
...
...
@@ -774,24 +774,16 @@ describe API::Issues do
it
'creates a new project issue'
do
post
api
(
"/projects/
#{
project
.
id
}
/issues"
,
user
),
<<<<<<<
HEAD
title:
'new issue'
,
labels:
'label, label2'
=======
title:
'new issue'
,
labels:
'label, label2'
,
weight:
3
,
assignee_ids:
[
user2
.
id
]
>>>>>>>
b0a2435
...
Merge
branch
'multiple_assignees_review_upstream'
into
ee_master
expect
(
response
).
to
have_http_status
(
201
)
expect
(
json_response
[
'title'
]).
to
eq
(
'new issue'
)
expect
(
json_response
[
'description'
]).
to
be_nil
expect
(
json_response
[
'labels'
]).
to
eq
(
%w(label label2)
)
expect
(
json_response
[
'confidential'
]).
to
be_falsy
<<<<<<<
HEAD
=======
expect
(
json_response
[
'weight'
]).
to
eq
(
3
)
expect
(
json_response
[
'assignee'
][
'name'
]).
to
eq
(
user2
.
name
)
expect
(
json_response
[
'assignees'
].
first
[
'name'
]).
to
eq
(
user2
.
name
)
>>>>>>>
b0a2435
...
Merge
branch
'multiple_assignees_review_upstream'
into
ee_master
end
it
'creates a new confidential project issue'
do
...
...
spec/requests/api/v3/issues_spec.rb
View file @
b0a9a7cf
...
...
@@ -737,22 +737,14 @@ describe API::V3::Issues do
describe
"POST /projects/:id/issues"
do
it
'creates a new project issue'
do
post
v3_api
(
"/projects/
#{
project
.
id
}
/issues"
,
user
),
<<<<<<<
HEAD
title:
'new issue'
,
labels:
'label, label2'
=======
title:
'new issue'
,
labels:
'label, label2'
,
weight:
3
,
assignee_id:
assignee
.
id
>>>>>>>
b0a2435
...
Merge
branch
'multiple_assignees_review_upstream'
into
ee_master
title:
'new issue'
,
labels:
'label, label2'
,
assignee_id:
assignee
.
id
expect
(
response
).
to
have_http_status
(
201
)
expect
(
json_response
[
'title'
]).
to
eq
(
'new issue'
)
expect
(
json_response
[
'description'
]).
to
be_nil
expect
(
json_response
[
'labels'
]).
to
eq
(
%w(label label2)
)
expect
(
json_response
[
'confidential'
]).
to
be_falsy
<<<<<<<
HEAD
=======
expect
(
json_response
[
'weight'
]).
to
eq
(
3
)
expect
(
json_response
[
'assignee'
][
'name'
]).
to
eq
(
assignee
.
name
)
>>>>>>>
b0a2435
...
Merge
branch
'multiple_assignees_review_upstream'
into
ee_master
end
it
'creates a new confidential project issue'
do
...
...
@@ -1149,8 +1141,6 @@ describe API::V3::Issues do
end
end
<<<<<<<
HEAD
=======
describe
'PUT /projects/:id/issues/:issue_id to update assignee'
do
it
'updates an issue with no assignee'
do
put
v3_api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
id
}
"
,
user
),
assignee_id:
0
...
...
@@ -1199,7 +1189,6 @@ describe API::V3::Issues do
end
end
>>>>>>>
b0a2435
...
Merge
branch
'multiple_assignees_review_upstream'
into
ee_master
describe
"DELETE /projects/:id/issues/:issue_id"
do
it
"rejects a non member from deleting an issue"
do
delete
v3_api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
id
}
"
,
non_member
)
...
...
spec/services/slash_commands/interpret_service_spec.rb
View file @
b0a9a7cf
...
...
@@ -43,26 +43,6 @@ describe SlashCommands::InterpretService, services: true do
end
end
<<<<<<<
HEAD
shared_examples
'assign command'
do
it
'fetches assignee and populates assignee_id if content contains /assign'
do
_
,
updates
=
service
.
execute
(
content
,
issuable
)
expect
(
updates
).
to
eq
(
assignee_id:
developer
.
id
)
end
end
shared_examples
'unassign command'
do
it
'populates assignee_id: nil if content contains /unassign'
do
issuable
.
update!
(
assignee_id:
developer
.
id
)
_
,
updates
=
service
.
execute
(
content
,
issuable
)
expect
(
updates
).
to
eq
(
assignee_id:
nil
)
end
end
=======
>>>>>>>
b0a2435
...
Merge
branch
'multiple_assignees_review_upstream'
into
ee_master
shared_examples
'milestone command'
do
it
'fetches milestone and populates milestone_id if content contains /milestone'
do
milestone
# populate the milestone
...
...
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