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
dbb08f2a
Commit
dbb08f2a
authored
Jul 25, 2018
by
Mark Chao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename existing Epic#issues to Epic#issues_readable_by
The name is reserved for more common association methods.
parent
ceb0924c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
ee/app/models/ee/epic.rb
ee/app/models/ee/epic.rb
+1
-1
ee/app/services/epic_issues/list_service.rb
ee/app/services/epic_issues/list_service.rb
+1
-1
ee/lib/api/epic_issues.rb
ee/lib/api/epic_issues.rb
+2
-2
ee/spec/models/epic_spec.rb
ee/spec/models/epic_spec.rb
+2
-2
No files found.
ee/app/models/ee/epic.rb
View file @
dbb08f2a
...
...
@@ -142,7 +142,7 @@ module EE
def
update_project_counter_caches
end
def
issues
(
current_user
)
def
issues
_readable_by
(
current_user
)
related_issues
=
::
Issue
.
select
(
'issues.*, epic_issues.id as epic_issue_id, epic_issues.relative_position'
)
.
joins
(
:epic_issue
)
.
where
(
"epic_issues.epic_id =
#{
id
}
"
)
...
...
ee/app/services/epic_issues/list_service.rb
View file @
dbb08f2a
...
...
@@ -5,7 +5,7 @@ module EpicIssues
def
issues
return
[]
unless
issuable
&
.
group
&
.
feature_available?
(
:epics
)
issuable
.
issues
(
current_user
)
issuable
.
issues
_readable_by
(
current_user
)
end
def
relation_path
(
issue
)
...
...
ee/lib/api/epic_issues.rb
View file @
dbb08f2a
...
...
@@ -53,7 +53,7 @@ module API
# For now we return empty body
# The issues list in the correct order in body will be returned as part of #4250
if
result
present
epic
.
issues
(
current_user
),
present
epic
.
issues
_readable_by
(
current_user
),
with:
EE
::
API
::
Entities
::
EpicIssue
,
current_user:
current_user
else
...
...
@@ -70,7 +70,7 @@ module API
get
':id/(-/)epics/:epic_iid/issues'
do
authorize_can_read!
present
epic
.
issues
(
current_user
),
present
epic
.
issues
_readable_by
(
current_user
),
with:
EE
::
API
::
Entities
::
EpicIssue
,
current_user:
current_user
end
...
...
ee/spec/models/epic_spec.rb
View file @
dbb08f2a
...
...
@@ -180,7 +180,7 @@ describe Epic do
end
end
describe
'#issues'
do
describe
'#issues
_readable_by
'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:group
)
{
create
(
:group
,
:private
)
}
let
(
:project
)
{
create
(
:project
,
group:
group
)
}
...
...
@@ -197,7 +197,7 @@ describe Epic do
]
end
let
(
:result
)
{
epic
.
issues
(
user
)
}
let
(
:result
)
{
epic
.
issues
_readable_by
(
user
)
}
it
'returns all issues if a user has access to them'
do
group
.
add_developer
(
user
)
...
...
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