Commit fa7ee3ad authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

parents ba39ca9f 3ab7933c
...@@ -6,6 +6,8 @@ v 7.10.0 (unreleased) ...@@ -6,6 +6,8 @@ v 7.10.0 (unreleased)
- Add a service to support external wikis (Hannes Rosenögger) - Add a service to support external wikis (Hannes Rosenögger)
- List new commits for newly pushed branch in activity view. - List new commits for newly pushed branch in activity view.
- Add changelog, license and contribution guide links to project sidebar. - Add changelog, license and contribution guide links to project sidebar.
- Improve diff UI
- Identical look of selectboxes in UI
v 7.9.0 (unreleased) v 7.9.0 (unreleased)
- Add HipChat integration documentation (Stan Hu) - Add HipChat integration documentation (Stan Hu)
......
...@@ -169,9 +169,7 @@ $ -> ...@@ -169,9 +169,7 @@ $ ->
# Show/hide comments on diff # Show/hide comments on diff
$("body").on "click", ".js-toggle-diff-comments", (e) -> $("body").on "click", ".js-toggle-diff-comments", (e) ->
$(@).find('i'). $(@).toggleClass('active')
toggleClass('fa fa-chevron-down').
toggleClass('fa fa-chevron-up')
$(@).closest(".diff-file").find(".notes_holder").toggle() $(@).closest(".diff-file").find(".notes_holder").toggle()
e.preventDefault() e.preventDefault()
......
...@@ -46,55 +46,13 @@ ...@@ -46,55 +46,13 @@
} }
} }
select { .select2-container {
&.select2 { width: 100% !important;
width: 100px;
}
&.select2-sm {
width: 100px;
}
}
@media (min-width: $screen-sm-min) {
select {
&.select2 {
width: 150px;
}
&.select2-sm {
width: 120px;
}
}
} }
/* Medium devices (desktops, 992px and up) */
@media (min-width: $screen-md-min) {
select {
&.select2 {
width: 170px;
}
&.select2-sm {
width: 140px;
}
}
}
/* Large devices (large desktops, 1200px and up) */
@media (min-width: $screen-lg-min) {
select {
&.select2 {
width: 200px;
}
&.select2-sm {
width: 150px;
}
}
}
/** Branch/tag selector **/ /** Branch/tag selector **/
.project-refs-form .select2-container { .project-refs-form .select2-container {
margin-right: 10px; width: 160px !important;
} }
.ajax-users-dropdown, .ajax-project-users-dropdown { .ajax-users-dropdown, .ajax-project-users-dropdown {
......
.new-group-member-holder { .new-group-member-holder {
margin-top: 50px; margin-top: 50px;
background: #f9f9f9;
padding-top: 20px; padding-top: 20px;
} }
......
...@@ -59,33 +59,34 @@ ...@@ -59,33 +59,34 @@
} }
} }
@media (min-width: 800px) { .issues_filters select { width: 160px; } } @media (min-width: 800px) {
@media (min-width: 1200px) { .issues_filters select { width: 220px; } } .issues_bulk_update {
select, .select2-container {
width: 120px !important;
display: inline-block;
}
}
}
@media (min-width: 800px) { .issues_bulk_update .select2-container { min-width: 120px; } } @media (min-width: 1200px) {
@media (min-width: 1200px) { .issues_bulk_update .select2-container { min-width: 160px; } } .issues_bulk_update {
select, .select2-container {
width: 160px !important;
display: inline-block;
}
}
}
.issues_bulk_update { .issues_bulk_update {
.select2-container .select2-choice { .select2-container .select2-choice {
color: #444 !important; color: #444 !important;
font-weight: 500;
} }
} }
#update_status {
width: 100px;
}
.participants { .participants {
margin-bottom: 20px; margin-bottom: 20px;
} }
.issues_bulk_update {
.select2-container {
text-shadow: none;
}
}
.issue-search-form { .issue-search-form {
margin: 0; margin: 0;
height: 24px; height: 24px;
...@@ -177,6 +178,6 @@ h2.issue-title { ...@@ -177,6 +178,6 @@ h2.issue-title {
font-weight: bold; font-weight: bold;
} }
.context .select2-container { .issue-form .select2-container {
width: 100% !important; width: 250px !important;
} }
...@@ -194,3 +194,7 @@ ...@@ -194,3 +194,7 @@
} }
} }
} }
.merge-request-form .select2-container {
width: 250px !important;
}
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
.tree-ref-holder { .tree-ref-holder {
float: left; float: left;
margin-right: 6px; margin-right: 15px;
.select2-container .select2-choice, .select2-container.select2-drop-above .select2-choice { .select2-container .select2-choice, .select2-container.select2-drop-above .select2-choice {
padding: 4px 12px; padding: 4px 12px;
......
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
%i.fa.fa-minus.fa-inverse %i.fa.fa-minus.fa-inverse
.edit-member.hide.js-toggle-content .edit-member.hide.js-toggle-content
%br
= form_for [@group, member], remote: true do |f| = form_for [@group, member], remote: true do |f|
.alert.prepend-top-20 .prepend-top-10
= f.select :access_level, options_for_select(GroupMember.access_level_roles, member.access_level) = f.select :access_level, options_for_select(GroupMember.access_level_roles, member.access_level), {}, class: 'form-control'
.prepend-top-10
= f.submit 'Save', class: 'btn btn-save btn-sm' = f.submit 'Save', class: 'btn btn-save btn-sm'
.row .row.prepend-top-20.append-bottom-10
.col-md-8 .col-md-8
= render 'projects/diffs/stats', diffs: diffs = render 'projects/diffs/stats', diffs: diffs
.col-md-4 .col-md-4
......
...@@ -22,9 +22,8 @@ ...@@ -22,9 +22,8 @@
.diff-btn-group .diff-btn-group
- if blob.text? - if blob.text?
= link_to '#', class: 'js-toggle-diff-comments btn btn-sm' do = link_to '#', class: 'js-toggle-diff-comments btn btn-sm active has_tooltip', title: "Toggle comments for this file" do
%i.fa.fa-chevron-down %i.fa.fa-comments
Show/Hide comments
   
- if @merge_request && @merge_request.source_project - if @merge_request && @merge_request.source_project
......
.js-toggle-container .js-toggle-container
.commit-stat-summary .commit-stat-summary
Showing Showing
%strong.cdark #{pluralize(diffs.count, "changed file")} = link_to '#', class: 'js-toggle-button' do
%strong #{pluralize(diffs.count, "changed file")}
- if current_controller?(:commit) - if current_controller?(:commit)
- unless @commit.has_zero_stats? - unless @commit.has_zero_stats?
with with
%strong.cgreen #{@commit.stats.additions} additions %strong.cgreen #{@commit.stats.additions} additions
and and
%strong.cred #{@commit.stats.deletions} deletions %strong.cred #{@commit.stats.deletions} deletions
 
= link_to '#', class: 'btn btn-sm js-toggle-button' do
Show diff stats
%i.fa.fa-chevron-down
.file-stats.js-toggle-content.hide .file-stats.js-toggle-content.hide
%ul.bordered-list %ul.bordered-list
- diffs.each_with_index do |diff, i| - diffs.each_with_index do |diff, i|
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
.clearfix .clearfix
.issues_bulk_update.hide .issues_bulk_update.hide
= form_tag bulk_update_namespace_project_issues_path(@project.namespace, @project), method: :post do = form_tag bulk_update_namespace_project_issues_path(@project.namespace, @project), method: :post do
= select_tag('update[state_event]', options_for_select([['Open', 'reopen'], ['Closed', 'close']]), prompt: "Status") = select_tag('update[state_event]', options_for_select([['Open', 'reopen'], ['Closed', 'close']]), prompt: "Status", class: 'form-control')
= project_users_select_tag('update[assignee_id]', placeholder: 'Assignee') = project_users_select_tag('update[assignee_id]', placeholder: 'Assignee')
= select_tag('update[milestone_id]', bulk_update_milestone_options, prompt: "Milestone") = select_tag('update[milestone_id]', bulk_update_milestone_options, prompt: "Milestone")
= hidden_field_tag 'update[issues_ids]', [] = hidden_field_tag 'update[issues_ids]', []
......
...@@ -29,7 +29,9 @@ ...@@ -29,7 +29,9 @@
%i.fa.fa-minus.fa-inverse %i.fa.fa-minus.fa-inverse
.edit-member.hide.js-toggle-content .edit-member.hide.js-toggle-content
%br
= form_for member, as: :project_member, url: namespace_project_project_member_path(@project.namespace, @project, member.user), remote: true do |f| = form_for member, as: :project_member, url: namespace_project_project_member_path(@project.namespace, @project, member.user), remote: true do |f|
.alert.prepend-top-20 .prepend-top-10
= f.select :access_level, options_for_select(ProjectMember.access_roles, member.access_level) = f.select :access_level, options_for_select(ProjectMember.access_roles, member.access_level), {}, class: 'form-control'
= f.submit 'Save', class: 'btn btn-save btn-sm' .prepend-top-10
= f.submit 'Save', class: 'btn btn-save'
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
.col-sm-10 .col-sm-10
= f.select(:name, @project.open_branches.map { |br| [br.name, br.name] } , {include_blank: "Select branch"}, {class: "select2"}) = f.select(:name, @project.open_branches.map { |br| [br.name, br.name] } , {include_blank: "Select branch"}, {class: "select2"})
.form-group .form-group
= f.label :developers_can_push, class: 'control-label' do .col-sm-offset-2.col-sm-10
Developers can push
.col-sm-10
.checkbox .checkbox
= f.label :developers_can_push do
= f.check_box :developers_can_push = f.check_box :developers_can_push
%span.descr Allow developers to push to this branch %strong Developers can push
.help-block Allow developers to push to this branch
.form-actions .form-actions
= f.submit 'Protect', class: "btn-create btn" = f.submit 'Protect', class: "btn-create btn"
= render 'branches_list' = render 'branches_list'
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
= f.text_field :path, placeholder: 'open-source', class: 'form-control', = f.text_field :path, placeholder: 'open-source', class: 'form-control',
autofocus: local_assigns[:autofocus] || false autofocus: local_assigns[:autofocus] || false
- if @group.persisted? - if @group.persisted?
.alert.alert-danger .alert.alert-warning.prepend-top-10
%ul %ul
%li Changing group path can have unintended side effects. %li Changing group path can have unintended side effects.
%li Renaming group path will rename directory for all related projects %li Renaming group path will rename directory for all related projects
......
...@@ -209,13 +209,13 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps ...@@ -209,13 +209,13 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step 'I click link "Hide inline discussion" of the second file' do step 'I click link "Hide inline discussion" of the second file' do
within '.files [id^=diff]:nth-child(2)' do within '.files [id^=diff]:nth-child(2)' do
click_link 'Show/Hide comments' find('.js-toggle-diff-comments').click
end end
end end
step 'I click link "Show inline discussion" of the second file' do step 'I click link "Show inline discussion" of the second file' do
within '.files [id^=diff]:nth-child(2)' do within '.files [id^=diff]:nth-child(2)' do
click_link 'Show/Hide comments' find('.js-toggle-diff-comments').click
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