Commit 97dc1b24 authored by Bryce Johnson's avatar Bryce Johnson Committed by Jacob Schatz

Style merge request diff dropdowns & disable comments.

parent b94de5fd
...@@ -163,6 +163,10 @@ v 8.11.6 ...@@ -163,6 +163,10 @@ v 8.11.6
- Fix an error where we were unable to create a CommitStatus for running state. !6107 - Fix an error where we were unable to create a CommitStatus for running state. !6107
- Optimize discussion notes resolving and unresolving. !6141 - Optimize discussion notes resolving and unresolving. !6141
- Fix GitLab import button. !6167 - Fix GitLab import button. !6167
- Frontend for Merge Request diff dropdowns
v 8.11.6 (unreleased)
- Fix an error where we were unable to create a CommitStatus for running state
- Restore SSH Key title auto-population behavior. !6186 - Restore SSH Key title auto-population behavior. !6186
- Fix DB schema to match latest migration. !6256 - Fix DB schema to match latest migration. !6256
- Exclude some pending or inactivated rows in Member scopes. - Exclude some pending or inactivated rows in Member scopes.
......
...@@ -373,11 +373,26 @@ ...@@ -373,11 +373,26 @@
.mr-version-controls { .mr-version-controls {
background: $background-color; background: $background-color;
padding: $gl-btn-padding; border: 1px solid $border-color;
border-top: 0;
padding: 0 16px;
color: $gl-placeholder-color; color: $gl-placeholder-color;
a.btn-link { .mr-version-dropdown,
color: $gl-dark-link-color; .mr-version-compare-dropdown {
margin: 0 10px;
}
.comments-disabled-notif {
border-top: 1px solid $border-color;
}
.dropdown-title {
color: $gl-text-color;
}
.fa-info-circle {
color: $red-normal;
} }
} }
......
-if @merge_request_diff
- comments_disabled = @merge_request_diff.latest? && !!@start_sha
- discussion = local_assigns.fetch(:discussion, nil) - discussion = local_assigns.fetch(:discussion, nil)
- if current_user - if current_user
%jump-to-discussion{ "inline-template" => true, ":discussion-id" => "'#{discussion.try(:id)}'" } %jump-to-discussion{ "inline-template" => true, ":discussion-id" => "'#{discussion.try(:id)}'" }
...@@ -5,5 +7,6 @@ ...@@ -5,5 +7,6 @@
%button.btn.btn-default.discussion-next-btn.has-tooltip{ "@click" => "jumpToNextUnresolvedDiscussion", %button.btn.btn-default.discussion-next-btn.has-tooltip{ "@click" => "jumpToNextUnresolvedDiscussion",
title: "Jump to next unresolved discussion", title: "Jump to next unresolved discussion",
"aria-label" => "Jump to next unresolved discussion", "aria-label" => "Jump to next unresolved discussion",
data: { container: "body" } } data: { container: "body" },
disabled: comments_disabled }
= custom_icon("next_discussion") = custom_icon("next_discussion")
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
- unless diff_file.submodule? - unless diff_file.submodule?
.file-actions.hidden-xs .file-actions.hidden-xs
- if blob_text_viewable?(blob) - if blob_text_viewable?(blob)
= link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip btn-file-option', title: "Toggle comments for this file" do = link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip btn-file-option', title: "Toggle comments for this files", disabled: @diff_notes_disabled do
= icon('comment') = icon('comment')
\ \
......
- if @merge_request_diffs.size > 1 - if @merge_request_diffs.size > 1
.mr-version-controls .mr-version-controls
%div.mr-version-menus-container.content-block
Changes between Changes between
%span.dropdown.inline.mr-version-dropdown %span.dropdown.inline.mr-version-dropdown
%a.btn-link.dropdown-toggle{ data: {toggle: :dropdown} } %a.dropdown-toggle.btn.btn-default{ data: {toggle: :dropdown} }
%strong %span
- if @merge_request_diff.latest? - if @merge_request_diff.latest?
latest version latest version
- else - else
version #{version_index(@merge_request_diff)} version #{version_index(@merge_request_diff)}
%span.caret %span.caret
%ul.dropdown-menu.dropdown-menu-selectable %ul.dropdown-menu.dropdown-menu-selectable
.dropdown-title
%span Version:
%button.dropdown-title-button.dropdown-menu-close
%i.fa.fa-times.dropdown-menu-close-icon
- @merge_request_diffs.each do |merge_request_diff| - @merge_request_diffs.each do |merge_request_diff|
%li %li
= link_to merge_request_version_path(@project, @merge_request, merge_request_diff), class: ('is-active' if merge_request_diff == @merge_request_diff) do = link_to merge_request_version_path(@project, @merge_request, merge_request_diff), class: ('is-active' if merge_request_diff == @merge_request_diff) do
...@@ -26,14 +31,18 @@ ...@@ -26,14 +31,18 @@
- if @merge_request_diff.base_commit_sha - if @merge_request_diff.base_commit_sha
and and
%span.dropdown.inline.mr-version-compare-dropdown %span.dropdown.inline.mr-version-compare-dropdown
%a.btn-link.dropdown-toggle{ data: {toggle: :dropdown} } %a.btn.btn-default.dropdown-toggle{ data: {toggle: :dropdown} }
%strong %span
- if @start_sha - if @start_sha
version #{version_index(@start_version)} version #{version_index(@start_version)}
- else - else
#{@merge_request.target_branch} #{@merge_request.target_branch}
%span.caret %span.caret
%ul.dropdown-menu.dropdown-menu-selectable %ul.dropdown-menu.dropdown-menu-selectable
.dropdown-title
%span Compared with:
%button.dropdown-title-button.dropdown-menu-close
%i.fa.fa-times.dropdown-menu-close-icon
- @comparable_diffs.each do |merge_request_diff| - @comparable_diffs.each do |merge_request_diff|
%li %li
= link_to merge_request_version_path(@project, @merge_request, @merge_request_diff, merge_request_diff.head_commit_sha), class: ('is-active' if merge_request_diff == @start_version) do = link_to merge_request_version_path(@project, @merge_request, @merge_request_diff, merge_request_diff.head_commit_sha), class: ('is-active' if merge_request_diff == @start_version) do
...@@ -52,7 +61,7 @@ ...@@ -52,7 +61,7 @@
.monospace #{short_sha(@merge_request_diff.base_commit_sha)} .monospace #{short_sha(@merge_request_diff.base_commit_sha)}
- unless @merge_request_diff.latest? && !@start_sha - unless @merge_request_diff.latest? && !@start_sha
.prepend-top-10 .comments-disabled-notif.content-block
= icon('info-circle') = icon('info-circle')
- if @start_sha - if @start_sha
Comments are disabled because you're comparing two versions of this merge request. Comments are disabled because you're comparing two versions of this merge request.
......
...@@ -21,7 +21,7 @@ feature 'Merge Request versions', js: true, feature: true do ...@@ -21,7 +21,7 @@ feature 'Merge Request versions', js: true, feature: true do
describe 'switch between versions' do describe 'switch between versions' do
before do before do
page.within '.mr-version-dropdown' do page.within '.mr-version-dropdown' do
find('.btn-link').click find('.btn-default').click
click_link 'version 1' click_link 'version 1'
end end
end end
...@@ -37,17 +37,18 @@ feature 'Merge Request versions', js: true, feature: true do ...@@ -37,17 +37,18 @@ feature 'Merge Request versions', js: true, feature: true do
it 'show the message about disabled comments' do it 'show the message about disabled comments' do
expect(page).to have_content 'Comments are disabled' expect(page).to have_content 'Comments are disabled'
end end
end end
describe 'compare with older version' do describe 'compare with older version' do
before do before do
page.within '.mr-version-compare-dropdown' do page.within '.mr-version-compare-dropdown' do
find('.btn-link').click find('.btn-default').click
click_link 'version 1' click_link 'version 1'
end end
end end
it 'should has correct value in the compare dropdown' do it 'should have correct value in the compare dropdown' do
page.within '.mr-version-compare-dropdown' do page.within '.mr-version-compare-dropdown' do
expect(page).to have_content 'version 1' expect(page).to have_content 'version 1'
end end
...@@ -64,5 +65,13 @@ feature 'Merge Request versions', js: true, feature: true do ...@@ -64,5 +65,13 @@ feature 'Merge Request versions', js: true, feature: true do
it 'show diff between new and old version' do it 'show diff between new and old version' do
expect(page).to have_content '4 changed files with 15 additions and 6 deletions' expect(page).to have_content '4 changed files with 15 additions and 6 deletions'
end end
it 'should return to latest version when "Show latest version" button is clicked' do
click_link 'Show latest version'
page.within '.mr-version-dropdown' do
expect(page).to have_content 'latest version'
end
expect(page).to have_content '8 changed files'
end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment