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
dc9b21e7
Commit
dc9b21e7
authored
Sep 24, 2018
by
Chantal Rollison
Committed by
Kamil Trzciński
Sep 24, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add link to issue on epic
parent
cac5471a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
43 additions
and
1 deletion
+43
-1
ee/changelogs/unreleased/ccr-6318_system_note_for_issue.yml
ee/changelogs/unreleased/ccr-6318_system_note_for_issue.yml
+5
-0
ee/spec/controllers/groups/epics_controller_spec.rb
ee/spec/controllers/groups/epics_controller_spec.rb
+37
-0
lib/banzai/filter/abstract_reference_filter.rb
lib/banzai/filter/abstract_reference_filter.rb
+1
-1
No files found.
ee/changelogs/unreleased/ccr-6318_system_note_for_issue.yml
0 → 100644
View file @
dc9b21e7
---
title
:
Add link to issue on epic
merge_request
:
7407
author
:
type
:
fixed
ee/spec/controllers/groups/epics_controller_spec.rb
View file @
dc9b21e7
...
...
@@ -135,6 +135,43 @@ describe Groups::EpicsController do
end
end
describe
'GET #discussions'
do
before
do
sign_in
(
user
)
group
.
add_developer
(
user
)
SystemNoteService
.
epic_issue
(
epic
,
issue
,
user
,
:added
)
end
context
'when issue note is returned'
do
shared_examples
'issue link presence'
do
let
(
:issue
)
{
create
(
:issue
,
project:
project
,
description:
"Project Issue"
)
}
it
'the link to the issue is included'
do
get
:discussions
,
group_id:
group
,
id:
epic
.
to_param
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
json_response
.
size
).
to
eq
(
1
)
discussion
=
json_response
[
0
]
notes
=
discussion
[
"notes"
]
expect
(
notes
.
size
).
to
eq
(
1
)
expect
(
notes
[
0
][
"note_html"
]).
to
include
(
project_issue_path
(
project
,
issue
))
end
end
describe
'project default namespace'
do
it_behaves_like
'issue link presence'
do
let
(
:project
)
{
create
(
:project
,
:public
)
}
end
end
describe
'project group namespace'
do
it_behaves_like
'issue link presence'
do
let
(
:project
)
{
create
(
:project
,
namespace:
group
)}
end
end
end
end
describe
'GET #show'
do
def
show_epic
(
format
=
:html
)
get
:show
,
group_id:
group
,
id:
epic
.
to_param
,
format:
format
...
...
lib/banzai/filter/abstract_reference_filter.rb
View file @
dc9b21e7
...
...
@@ -327,7 +327,7 @@ module Banzai
end
def
current_project_namespace_path
@current_project_namespace_path
||=
project
&
.
namespace
&
.
full_path
@current_project_namespace_path
||=
(
project
&
.
namespace
||
group
)
&
.
full_path
end
private
...
...
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