diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-10-05 21:20:54 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-10-05 21:20:54 +0200 |
| commit | fc795d6ee2bdc1229f82c535222752364b5c9e44 (patch) | |
| tree | aa430acc42f5314a8af2fd7c3ab288df37abe1d0 /app/views/ci | |
| parent | e5e6c846ead9ea4cacc53c2308c5ca86ce1ab766 (diff) | |
| download | gitlab-ce-fc795d6ee2bdc1229f82c535222752364b5c9e44.tar.gz | |
Fix graphical glitches
Diffstat (limited to 'app/views/ci')
| -rw-r--r-- | app/views/ci/commits/_commit.html.haml | 3 | ||||
| -rw-r--r-- | app/views/ci/commits/show.html.haml | 26 |
2 files changed, 19 insertions, 10 deletions
diff --git a/app/views/ci/commits/_commit.html.haml b/app/views/ci/commits/_commit.html.haml index f8a1fa50851..6e6cc9b2c37 100644 --- a/app/views/ci/commits/_commit.html.haml +++ b/app/views/ci/commits/_commit.html.haml @@ -16,7 +16,8 @@ %td.build-branch - unless @ref %span - = link_to truncate(commit.last_ref, length: 25), ci_project_path(@project, ref: commit.last_ref) + - commit.refs.each do |ref| + = link_to truncate(ref, length: 25), ci_project_path(@project, ref: ref) %td.duration - if commit.duration > 0 diff --git a/app/views/ci/commits/show.html.haml b/app/views/ci/commits/show.html.haml index 7217671fe95..7ebef8c5e06 100644 --- a/app/views/ci/commits/show.html.haml +++ b/app/views/ci/commits/show.html.haml @@ -4,14 +4,22 @@ .gray-content-block.middle-block %pre.commit-message - #{@commit.git_commit_message} + - if @commit.git_commit_message + #{@commit.git_commit_message} + - else + No commit message .gray-content-block.second-block .row .col-sm-6 - %p - %span.attr-name Commit: - #{gitlab_commit_link(@project, @commit.sha)} + %p + %span.attr-name Commit: + #{gitlab_commit_link(@project, @commit.sha)} + %p + - if @commit.refs.present? + %span.attr-name Refs: + - @commit.refs.each do |ref| + #{gitlab_ref_link(@project, ref)} .col-sm-6 - if @commit.git_author_name || @commit.git_author_email %p @@ -22,10 +30,10 @@ %span.attr-name Created at: #{@commit.created_at.to_s(:short)} -- if current_user && can?(current_user, :manage_builds, gl_project) - .pull-right - - if @commit.builds.running_or_pending.any? - = link_to "Cancel", cancel_ci_project_commits_path(@project, @commit), class: 'btn btn-sm btn-danger' + - if current_user && can?(current_user, :manage_builds, gl_project) + - if @commit.builds.running_or_pending.any? + .pull-right + = link_to "Cancel", cancel_ci_project_commits_path(@project, @commit), class: 'btn btn-sm btn-danger' - if @commit.yaml_errors.present? @@ -41,7 +49,7 @@ - @commit.refs.each do |ref| %h3 - Builds for #{ref} + Builds for #{gitlab_ref_link(@project, ref)} - if @commit.duration_for_ref(ref) > 0 %small.pull-right %i.fa.fa-time |