MR commits suppressed if too many. few icons
This commit is contained in:
parent
3b7998e197
commit
5ef3b38429
|
@ -38,5 +38,11 @@ var MergeRequest = {
|
||||||
$('.status').removeClass("loading");
|
$('.status').removeClass("loading");
|
||||||
},
|
},
|
||||||
dataType: "script"});
|
dataType: "script"});
|
||||||
|
},
|
||||||
|
|
||||||
|
showAllCommits:
|
||||||
|
function() {
|
||||||
|
$(".first_mr_commits").remove();
|
||||||
|
$(".all_mr_commits").removeClass("hide");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,23 @@
|
||||||
- unless @commits.empty?
|
- unless @commits.empty?
|
||||||
.ui-box
|
.ui-box
|
||||||
%h5 Commits
|
%h5 Commits (#{@commits.count})
|
||||||
.merge-request-commits
|
.merge-request-commits
|
||||||
%ul.unstyled
|
- if @commits.count > 8
|
||||||
- @commits.each do |commit|
|
%ul.first_mr_commits.unstyled
|
||||||
= render "commits/commit", :commit => commit
|
- @commits.first(8).each do |commit|
|
||||||
|
= render "commits/commit", :commit => commit
|
||||||
|
%li.bottom
|
||||||
|
8 of #{@commits.count} commits displayed.
|
||||||
|
%strong
|
||||||
|
= link_to_function "Click here to show all", "MergeRequest.showAllCommits()"
|
||||||
|
%ul.all_mr_commits.hide.unstyled
|
||||||
|
- @commits.each do |commit|
|
||||||
|
= render "commits/commit", :commit => commit
|
||||||
|
|
||||||
|
- else
|
||||||
|
%ul.unstyled
|
||||||
|
- @commits.each do |commit|
|
||||||
|
= render "commits/commit", :commit => commit
|
||||||
|
|
||||||
- else
|
- else
|
||||||
%h5
|
%h5
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
%ul.nav.nav-tabs
|
%ul.nav.nav-tabs
|
||||||
%li{ :class => "#{'active' if current_page?(project_path(@project)) }" }
|
%li{ :class => "#{'active' if current_page?(project_path(@project)) }" }
|
||||||
= link_to project_path(@project), :class => "activities-tab tab" do
|
= link_to project_path(@project), :class => "activities-tab tab" do
|
||||||
|
%i.icon-home
|
||||||
Show
|
Show
|
||||||
%li{ :class => " #{'active' if (controller.controller_name == "team_members") || current_page?(team_project_path(@project)) }" }
|
%li{ :class => " #{'active' if (controller.controller_name == "team_members") || current_page?(team_project_path(@project)) }" }
|
||||||
= link_to team_project_path(@project), :class => "team-tab tab" do
|
= link_to team_project_path(@project), :class => "team-tab tab" do
|
||||||
|
%i.icon-user
|
||||||
Team
|
Team
|
||||||
%li{ :class => "#{'active' if current_page?(files_project_path(@project)) }" }
|
%li{ :class => "#{'active' if current_page?(files_project_path(@project)) }" }
|
||||||
= link_to files_project_path(@project), :class => "files-tab tab " do
|
= link_to files_project_path(@project), :class => "files-tab tab " do
|
||||||
|
@ -23,5 +25,6 @@
|
||||||
Hooks
|
Hooks
|
||||||
%li.right{ :class => "#{'active' if current_page?(edit_project_path(@project)) }" }
|
%li.right{ :class => "#{'active' if current_page?(edit_project_path(@project)) }" }
|
||||||
= link_to edit_project_path(@project), :class => "stat-tab tab " do
|
= link_to edit_project_path(@project), :class => "stat-tab tab " do
|
||||||
|
%i.icon-edit
|
||||||
Edit
|
Edit
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,9 @@
|
||||||
.span4.right
|
.span4.right
|
||||||
.right
|
.right
|
||||||
- if can? current_user, :download_code, @project
|
- if can? current_user, :download_code, @project
|
||||||
= link_to "Download", archive_project_repository_path(@project), :class => "btn small padded"
|
= link_to archive_project_repository_path(@project), :class => "btn small padded" do
|
||||||
|
%i.icon-download-alt
|
||||||
|
Download
|
||||||
- if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)
|
- if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)
|
||||||
= link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "btn small padded" do
|
= link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "btn small padded" do
|
||||||
Merge Request
|
Merge Request
|
||||||
|
|
Loading…
Reference in New Issue