Add a button to delegate all discussions in a merge request
This commit is contained in:
parent
f86928953d
commit
d6453e75b7
|
@ -510,6 +510,7 @@ ul.notes {
|
|||
}
|
||||
|
||||
.line-resolve-all-container {
|
||||
|
||||
.btn-group {
|
||||
margin-left: -4px;
|
||||
}
|
||||
|
@ -518,6 +519,25 @@ ul.notes {
|
|||
border-top-left-radius: 0;
|
||||
border-bottom-left-radius: 0;
|
||||
}
|
||||
|
||||
.btn.discussion-create-issue-btn {
|
||||
margin-left: 4px;
|
||||
|
||||
a {
|
||||
padding: 0;
|
||||
line-height: 0;
|
||||
|
||||
&:hover {
|
||||
text-decoration: none;
|
||||
border: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.new-issue-for-discussion path {
|
||||
fill: $gray-darkest;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.line-resolve-all {
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
- if merge_request.discussions_can_be_resolved_by?(current_user) && can?(current_user, :create_issue, @project)
|
||||
.btn-group{ role: "group", "v-if" => "unresolvedDiscussionCount > 0" }
|
||||
.btn.btn-default.discussion-create-issue-btn.has-tooltip{ title: "Resolve all discussions in new issue",
|
||||
"aria-label" => "Resolve all discussions in new issue",
|
||||
"data-container" => "body" }
|
||||
= link_to custom_icon('icon_mr_issue'), new_namespace_project_issue_path(@project.namespace, @project, merge_request_for_resolving_discussions: merge_request.iid), title: "Resolve all discussions in new issue", class: 'new-issue-for-discussion'
|
|
@ -83,6 +83,7 @@
|
|||
%span.line-resolve-text
|
||||
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
|
||||
= render "discussions/jump_to_next"
|
||||
= render "discussions/new_issue_for_all_discussions", merge_request: @merge_request
|
||||
|
||||
.tab-content#diff-notes-app
|
||||
#notes.notes.tab-pane.voting_notes
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 28 KiB |
|
@ -53,12 +53,18 @@ are resolved.
|
|||
|
||||
## Move all unresolved discussions in a merge request to an issue
|
||||
|
||||
> [Introduced][ce-7180] in GitLab 8.15.
|
||||
> [Introduced][ce-8266]
|
||||
|
||||
To delegate unresolved discussions to a new issue you can click the link **open
|
||||
an issue to resolve them later**.
|
||||
To continue all open discussions in a merge request, click the button **Resolve
|
||||
all discussions in new issue**
|
||||
|
||||
![Open new issue from unresolved discussions](img/resolve_discussion_open_issue.png)
|
||||
![Open new issue for all unresolved discussions](img/btn_new_issue_for_all_discussions.png)
|
||||
|
||||
Alternatively, when your project only accepts merge requests when all discussions
|
||||
are resolved, there will be an **open an issue to resolve them later** link in
|
||||
the merge request-widget.
|
||||
|
||||
![Link in merge request widget](img/resolve_discussion_open_issue.png)
|
||||
|
||||
This will prepare an issue with content referring to the merge request and
|
||||
discussions.
|
||||
|
|
|
@ -1,54 +1,79 @@
|
|||
require 'rails_helper'
|
||||
|
||||
feature 'Resolving all open discussions in a merge request from an issue', feature: true do
|
||||
feature 'Resolving all open discussions in a merge request from an issue', feature: true, js: true do
|
||||
let(:user) { create(:user) }
|
||||
let(:project) { create(:project, only_allow_merge_if_all_discussions_are_resolved: true) }
|
||||
let(:project) { create(:project) }
|
||||
let(:merge_request) { create(:merge_request, source_project: project) }
|
||||
let!(:discussion) { Discussion.for_diff_notes([create(:diff_note_on_merge_request, noteable: merge_request, project: project)]).first }
|
||||
|
||||
before do
|
||||
project.team << [user, :master]
|
||||
login_as user
|
||||
visit namespace_project_merge_request_path(project.namespace, project, merge_request)
|
||||
end
|
||||
|
||||
context 'with the internal tracker disabled' do
|
||||
before do
|
||||
project.project_feature.update_attribute(:issues_access_level, ProjectFeature::DISABLED)
|
||||
visit namespace_project_merge_request_path(project.namespace, project, merge_request)
|
||||
end
|
||||
|
||||
it 'does not show a link to create a new issue' do
|
||||
expect(page).not_to have_link 'open an issue to resolve them later'
|
||||
it 'shows a button to resolve all discussions by creating a new issue' do
|
||||
within('li#resolve-count-app') do
|
||||
expect(page).to have_link "Resolve all discussions in new issue", href: new_namespace_project_issue_path(project.namespace, project, merge_request_for_resolving_discussions: merge_request.iid)
|
||||
end
|
||||
end
|
||||
|
||||
context 'merge request has discussions that need to be resolved' do
|
||||
context 'resolving the discussion' do
|
||||
before do
|
||||
visit namespace_project_merge_request_path(project.namespace, project, merge_request)
|
||||
click_button 'Resolve discussion'
|
||||
end
|
||||
|
||||
it 'shows a warning that the merge request contains unresolved discussions' do
|
||||
expect(page).to have_content 'This merge request has unresolved discussions'
|
||||
it 'hides the link for creating a new issue' do
|
||||
expect(page).not_to have_link "Resolve all discussions in new issue", href: new_namespace_project_issue_path(project.namespace, project, merge_request_for_resolving_discussions: merge_request.iid)
|
||||
end
|
||||
end
|
||||
|
||||
context 'creating an issue for discussions' do
|
||||
before do
|
||||
click_link "Resolve all discussions in new issue", href: new_namespace_project_issue_path(project.namespace, project, merge_request_for_resolving_discussions: merge_request.iid)
|
||||
end
|
||||
|
||||
it 'has a link to resolve all discussions by creating an issue' do
|
||||
page.within '.mr-widget-body' do
|
||||
expect(page).to have_link 'open an issue to resolve them later', href: new_namespace_project_issue_path(project.namespace, project, merge_request_for_resolving_discussions: merge_request.iid)
|
||||
end
|
||||
it_behaves_like 'creating an issue for a discussion'
|
||||
end
|
||||
|
||||
context 'for a project where all discussions need to be resolved before merging' do
|
||||
before do
|
||||
project.update_attribute(:only_allow_merge_if_all_discussions_are_resolved, true)
|
||||
end
|
||||
|
||||
context 'creating an issue for discussions' do
|
||||
context 'with the internal tracker disabled' do
|
||||
before do
|
||||
page.click_link 'open an issue to resolve them later', href: new_namespace_project_issue_path(project.namespace, project, merge_request_for_resolving_discussions: merge_request.iid)
|
||||
project.project_feature.update_attribute(:issues_access_level, ProjectFeature::DISABLED)
|
||||
visit namespace_project_merge_request_path(project.namespace, project, merge_request)
|
||||
end
|
||||
|
||||
it 'has a hidden field for the discussion' do
|
||||
merge_request_field = find('#merge_request_for_resolving_discussions', visible: false)
|
||||
it 'does not show a link to create a new issue' do
|
||||
expect(page).not_to have_link 'open an issue to resolve them later'
|
||||
end
|
||||
end
|
||||
|
||||
expect(merge_request_field.value).to eq(merge_request.iid.to_s)
|
||||
context 'merge request has discussions that need to be resolved' do
|
||||
before do
|
||||
visit namespace_project_merge_request_path(project.namespace, project, merge_request)
|
||||
end
|
||||
|
||||
it_behaves_like 'creating an issue for a discussion'
|
||||
it 'shows a warning that the merge request contains unresolved discussions' do
|
||||
expect(page).to have_content 'This merge request has unresolved discussions'
|
||||
end
|
||||
|
||||
it 'has a link to resolve all discussions by creating an issue' do
|
||||
page.within '.mr-widget-body' do
|
||||
expect(page).to have_link 'open an issue to resolve them later', href: new_namespace_project_issue_path(project.namespace, project, merge_request_for_resolving_discussions: merge_request.iid)
|
||||
end
|
||||
end
|
||||
|
||||
context 'creating an issue for discussions' do
|
||||
before do
|
||||
page.click_link 'open an issue to resolve them later', href: new_namespace_project_issue_path(project.namespace, project, merge_request_for_resolving_discussions: merge_request.iid)
|
||||
end
|
||||
|
||||
it_behaves_like 'creating an issue for a discussion'
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue