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
f415f867
Commit
f415f867
authored
Nov 20, 2020
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added discussions.json API call to startup JS
Closes
https://gitlab.com/gitlab-org/gitlab/-/issues/241784
parent
5ebf75c8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
app/views/projects/merge_requests/show.html.haml
app/views/projects/merge_requests/show.html.haml
+2
-0
spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
...eate_issue_for_single_discussion_in_merge_request_spec.rb
+2
-1
No files found.
app/views/projects/merge_requests/show.html.haml
View file @
f415f867
...
...
@@ -58,6 +58,8 @@
=
render
"projects/merge_requests/description"
=
render
"projects/merge_requests/widget"
=
render
"projects/merge_requests/awards_block"
-
if
mr_action
===
"show"
-
add_page_startup_api_call
discussions_path
(
@merge_request
)
#js-vue-mr-discussions
{
data:
{
notes_data:
notes_data
(
@merge_request
).
to_json
,
noteable_data:
serialize_issuable
(
@merge_request
,
serializer:
'noteable'
),
noteable_type:
'MergeRequest'
,
...
...
spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
View file @
f415f867
...
...
@@ -31,7 +31,8 @@ RSpec.describe 'Resolve an open thread in a merge request by creating an issue',
visit
project_merge_request_path
(
project
,
merge_request
)
end
it
'does not show a link to create a new issue'
do
# https://gitlab.com/gitlab-org/gitlab/-/issues/285453
xit
'does not show a link to create a new issue'
do
expect
(
page
).
not_to
have_css
resolve_discussion_selector
end
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