Merge branch 'move-mr-builds-tab' into 'master'
Move MR Builds tab next to Commits Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/4132 @dzaporozhets We've got two people who feel strongly about this now, @sytses filed an issue for it :) ![Screen_Shot_2015-12-16_at_22.19.35](/uploads/37e705610ba54e386928d7972398c247/Screen_Shot_2015-12-16_at_22.19.35.png) See merge request !2128
This commit is contained in:
commit
a9b078535b
2 changed files with 11 additions and 11 deletions
|
@ -23,15 +23,15 @@
|
|||
= link_to url_for(params), data: {target: 'div#commits', action: 'commits', toggle: 'tab'} do
|
||||
Commits
|
||||
%span.badge= @commits.size
|
||||
%li.diffs-tab.active
|
||||
= link_to url_for(params), data: {target: 'div#diffs', action: 'diffs', toggle: 'tab'} do
|
||||
Changes
|
||||
%span.badge= @diffs.size
|
||||
- if @ci_commit
|
||||
%li.builds-tab.active
|
||||
= link_to url_for(params), data: {target: 'div#builds', action: 'builds', toggle: 'tab'} do
|
||||
Builds
|
||||
%span.badge= @statuses.size
|
||||
%li.diffs-tab.active
|
||||
= link_to url_for(params), data: {target: 'div#diffs', action: 'diffs', toggle: 'tab'} do
|
||||
Changes
|
||||
%span.badge= @diffs.size
|
||||
|
||||
.tab-content
|
||||
#commits.commits.tab-pane
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
.merge-request{'data-url' => merge_request_path(@merge_request)}
|
||||
= render "projects/merge_requests/show/mr_title"
|
||||
|
||||
|
||||
.merge-request-details.issuable-details
|
||||
.row
|
||||
%section.col-md-9
|
||||
|
@ -53,25 +53,25 @@
|
|||
= link_to commits_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#commits', action: 'commits', toggle: 'tab'} do
|
||||
Commits
|
||||
%span.badge= @commits.size
|
||||
%li.diffs-tab
|
||||
= link_to diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#diffs', action: 'diffs', toggle: 'tab'} do
|
||||
Changes
|
||||
%span.badge= @merge_request.diffs.size
|
||||
- if @ci_commit
|
||||
%li.builds-tab
|
||||
= link_to builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: '#builds', action: 'builds', toggle: 'tab'} do
|
||||
Builds
|
||||
%span.badge= @statuses.size
|
||||
%li.diffs-tab
|
||||
= link_to diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#diffs', action: 'diffs', toggle: 'tab'} do
|
||||
Changes
|
||||
%span.badge= @merge_request.diffs.size
|
||||
|
||||
.tab-content
|
||||
#notes.notes.tab-pane.voting_notes
|
||||
= render "projects/merge_requests/discussion"
|
||||
#commits.commits.tab-pane
|
||||
- # This tab is always loaded via AJAX
|
||||
#diffs.diffs.tab-pane
|
||||
- # This tab is always loaded via AJAX
|
||||
#builds.builds.tab-pane
|
||||
- # This tab is always loaded via AJAX
|
||||
#diffs.diffs.tab-pane
|
||||
- # This tab is always loaded via AJAX
|
||||
|
||||
.mr-loading-status
|
||||
= spinner
|
||||
|
|
Loading…
Reference in a new issue