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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
972573e3
Commit
972573e3
authored
Jul 27, 2019
by
Tomislav Nikic
Committed by
Dan Davison
Jul 27, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding changes to CE from EE
All the changes done to files that are also inside CE and need to be ported.
parent
7dccb444
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
7 deletions
+19
-7
app/assets/javascripts/diffs/components/diff_discussion_reply.vue
...ts/javascripts/diffs/components/diff_discussion_reply.vue
+0
-1
app/assets/javascripts/diffs/components/diff_file_header.vue
app/assets/javascripts/diffs/components/diff_file_header.vue
+1
-0
app/assets/javascripts/notes/components/discussion_actions.vue
...ssets/javascripts/notes/components/discussion_actions.vue
+1
-1
app/assets/javascripts/notes/components/note_form.vue
app/assets/javascripts/notes/components/note_form.vue
+6
-2
app/views/projects/merge_requests/show.html.haml
app/views/projects/merge_requests/show.html.haml
+1
-1
qa/qa/page/component/note.rb
qa/qa/page/component/note.rb
+10
-2
No files found.
app/assets/javascripts/diffs/components/diff_discussion_reply.vue
View file @
972573e3
...
@@ -44,7 +44,6 @@ export default {
...
@@ -44,7 +44,6 @@ export default {
class=
"d-none d-sm-block"
class=
"d-none d-sm-block"
/>
/>
<reply-placeholder
<reply-placeholder
class=
"qa-discussion-reply"
:button-text=
"__('Start a new discussion...')"
:button-text=
"__('Start a new discussion...')"
@
onClick=
"$emit('showNewDiscussionForm')"
@
onClick=
"$emit('showNewDiscussionForm')"
/>
/>
...
...
app/assets/javascripts/diffs/components/diff_file_header.vue
View file @
972573e3
...
@@ -263,6 +263,7 @@ export default {
...
@@ -263,6 +263,7 @@ export default {
:disabled=
"!diffHasDiscussions(diffFile)"
:disabled=
"!diffHasDiscussions(diffFile)"
:class=
"
{ active: hasExpandedDiscussions }"
:class=
"
{ active: hasExpandedDiscussions }"
class="js-btn-vue-toggle-comments btn"
class="js-btn-vue-toggle-comments btn"
data-qa-selector="toggle_comments_button"
type="button"
type="button"
@click="handleToggleDiscussions"
@click="handleToggleDiscussions"
>
>
...
...
app/assets/javascripts/notes/components/discussion_actions.vue
View file @
972573e3
...
@@ -41,8 +41,8 @@ export default {
...
@@ -41,8 +41,8 @@ export default {
<
template
>
<
template
>
<div
class=
"discussion-with-resolve-btn clearfix"
>
<div
class=
"discussion-with-resolve-btn clearfix"
>
<reply-placeholder
<reply-placeholder
data-qa-selector=
"discussion_reply_tab"
:button-text=
"s__('MergeRequests|Reply...')"
:button-text=
"s__('MergeRequests|Reply...')"
class=
"qa-discussion-reply"
@
onClick=
"$emit('showReplyForm')"
@
onClick=
"$emit('showReplyForm')"
/>
/>
...
...
app/assets/javascripts/notes/components/note_form.vue
View file @
972573e3
...
@@ -293,12 +293,16 @@ export default {
...
@@ -293,12 +293,16 @@ export default {
<input
<input
v-model=
"isUnresolving"
v-model=
"isUnresolving"
type=
"checkbox"
type=
"checkbox"
class=
"qa-unresolve-review-discussion
"
data-qa-selector=
"unresolve_review_discussion_checkbox
"
/>
/>
{{
__
(
'
Unresolve thread
'
)
}}
{{
__
(
'
Unresolve thread
'
)
}}
</
template
>
</
template
>
<
template
v-else
>
<
template
v-else
>
<input
v-model=
"isResolving"
type=
"checkbox"
class=
"qa-resolve-review-discussion"
/>
<input
v-model=
"isResolving"
type=
"checkbox"
data-qa-selector=
"resolve_review_discussion_checkbox"
/>
{{
__
(
'
Resolve thread
'
)
}}
{{
__
(
'
Resolve thread
'
)
}}
</
template
>
</
template
>
</label>
</label>
...
...
app/views/projects/merge_requests/show.html.haml
View file @
972573e3
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
.merge-request-tabs-holder
{
class:
(
"js-tabs-affix"
unless
ENV
[
'RAILS_ENV'
]
==
'test'
)
}
.merge-request-tabs-holder
{
class:
(
"js-tabs-affix"
unless
ENV
[
'RAILS_ENV'
]
==
'test'
)
}
.merge-request-tabs-container
.merge-request-tabs-container
%ul
.merge-request-tabs.nav-tabs.nav.nav-links
%ul
.merge-request-tabs.nav-tabs.nav.nav-links
%li
.notes-tab
.qa-notes-tab
%li
.notes-tab
{
data:
{
qa_selector:
'notes_tab'
}
}
=
tab_link_for
@merge_request
,
:show
,
force_link:
@commit
.
present?
do
=
tab_link_for
@merge_request
,
:show
,
force_link:
@commit
.
present?
do
=
_
(
"Discussion"
)
=
_
(
"Discussion"
)
%span
.badge.badge-pill
=
@merge_request
.
related_notes
.
user
.
count
%span
.badge.badge-pill
=
@merge_request
.
related_notes
.
user
.
count
...
...
qa/qa/page/component/note.rb
View file @
972573e3
...
@@ -20,13 +20,17 @@ module QA
...
@@ -20,13 +20,17 @@ module QA
end
end
base
.
view
'app/assets/javascripts/notes/components/discussion_actions.vue'
do
base
.
view
'app/assets/javascripts/notes/components/discussion_actions.vue'
do
element
:discussion_reply
element
:discussion_reply
_tab
end
end
base
.
view
'app/assets/javascripts/notes/components/toggle_replies_widget.vue'
do
base
.
view
'app/assets/javascripts/notes/components/toggle_replies_widget.vue'
do
element
:expand_replies
element
:expand_replies
element
:collapse_replies
element
:collapse_replies
end
end
base
.
view
'app/assets/javascripts/diffs/components/diff_file_header.vue'
do
element
:toggle_comments_button
end
end
end
def
start_discussion
(
text
)
def
start_discussion
(
text
)
...
@@ -36,8 +40,12 @@ module QA
...
@@ -36,8 +40,12 @@ module QA
click_element
:comment_button
click_element
:comment_button
end
end
def
toggle_comments
all_elements
(
:toggle_comments_button
).
last
.
click
end
def
type_reply_to_discussion
(
reply_text
)
def
type_reply_to_discussion
(
reply_text
)
all_elements
(
:discussion_reply
).
last
.
click
all_elements
(
:discussion_reply
_tab
).
last
.
click
fill_element
:reply_input
,
reply_text
fill_element
:reply_input
,
reply_text
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