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
1b9c2010
Commit
1b9c2010
authored
Apr 06, 2017
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Multiple issue assignees] fix some more specs
parent
d9240846
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
11 deletions
+11
-11
app/finders/issues_finder.rb
app/finders/issues_finder.rb
+5
-5
app/services/issues/update_service.rb
app/services/issues/update_service.rb
+1
-1
lib/api/v3/merge_requests.rb
lib/api/v3/merge_requests.rb
+1
-1
lib/api/v3/milestones.rb
lib/api/v3/milestones.rb
+2
-2
spec/support/features/issuable_slash_commands_shared_examples.rb
...pport/features/issuable_slash_commands_shared_examples.rb
+2
-2
No files found.
app/finders/issues_finder.rb
View file @
1b9c2010
...
...
@@ -28,14 +28,14 @@ class IssuesFinder < IssuableFinder
def
by_assignee
(
items
)
if
assignee
items
=
items
.
where
(
"issue_assignees.user_id = ?"
,
assignee
.
id
)
items
.
assigned_to
(
assignee
)
elsif
no_assignee?
items
=
items
.
where
(
"issue_assignees.user_id is NULL"
)
items
.
unassigned
elsif
assignee_id?
||
assignee_username?
# assignee not found
items
=
items
.
none
items
.
none
else
items
end
items
end
def
self
.
not_restricted_by_confidentiality
(
user
)
...
...
app/services/issues/update_service.rb
View file @
1b9c2010
...
...
@@ -22,7 +22,7 @@ module Issues
end
if
issue
.
previous_changes
.
include?
(
'title'
)
||
issue
.
previous_changes
.
include?
(
'description'
)
issue
.
previous_changes
.
include?
(
'description'
)
todo_service
.
update_issue
(
issue
,
current_user
)
end
...
...
lib/api/v3/merge_requests.rb
View file @
1b9c2010
...
...
@@ -32,7 +32,7 @@ module API
if
project
.
has_external_issue_tracker?
::
API
::
Entities
::
ExternalIssue
else
::
API
::
Entities
::
Issue
::
API
::
V3
::
Entities
::
Issue
end
end
...
...
lib/api/v3/milestones.rb
View file @
1b9c2010
...
...
@@ -39,7 +39,7 @@ module API
end
desc
'Get all issues for a single project milestone'
do
success
::
API
::
Entities
::
Issue
success
::
API
::
V3
::
Entities
::
Issue
end
params
do
requires
:milestone_id
,
type:
Integer
,
desc:
'The ID of a project milestone'
...
...
@@ -56,7 +56,7 @@ module API
}
issues
=
IssuesFinder
.
new
(
current_user
,
finder_params
).
execute
present
paginate
(
issues
),
with:
::
API
::
Entities
::
Issue
,
current_user:
current_user
,
project:
user_project
present
paginate
(
issues
),
with:
::
API
::
V3
::
Entities
::
Issue
,
current_user:
current_user
,
project:
user_project
end
end
end
...
...
spec/support/features/issuable_slash_commands_shared_examples.rb
View file @
1b9c2010
...
...
@@ -63,7 +63,7 @@ shared_examples 'issuable record that supports slash commands in its description
note
=
issuable
.
notes
.
user
.
first
expect
(
note
.
note
).
to
eq
"Awesome!"
expect
(
issuable
.
assignee
).
to
eq
assignee
expect
(
issuable
.
assignee
s
).
to
eq
[
assignee
]
expect
(
issuable
.
labels
).
to
eq
[
label_bug
]
expect
(
issuable
.
milestone
).
to
eq
milestone
end
...
...
@@ -81,7 +81,7 @@ shared_examples 'issuable record that supports slash commands in its description
issuable
.
reload
expect
(
issuable
.
notes
.
user
).
to
be_empty
expect
(
issuable
.
assignee
).
to
eq
assignee
expect
(
issuable
.
assignee
s
).
to
eq
[
assignee
]
expect
(
issuable
.
labels
).
to
eq
[
label_bug
]
expect
(
issuable
.
milestone
).
to
eq
milestone
end
...
...
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