kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix alerts

Browse source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2014-01-03 23:15:13 +02:00
parent 779355ae8e
commit 423ffe29d5
No known key found for this signature in database
GPG key ID: 627C5F589F467F17
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/projects/merge_requests/_show.html.haml
View file

@ -12,7 +12,7 @@
= render "projects/merge_requests/show/commits" = render "projects/merge_requests/show/commits"
- if @commits.present? - if @commits.present?
%ul.nav.nav-tabs %ul.nav.nav-tabs.append-bottom-10
%li.notes-tab{data: {action: 'notes'}} %li.notes-tab{data: {action: 'notes'}}
= link_to project_merge_request_path(@project, @merge_request) do = link_to project_merge_request_path(@project, @merge_request) do
%i.icon-comment %i.icon-comment

2
app/views/projects/merge_requests/show/_mr_accept.html.haml
View file

@ -37,7 +37,7 @@
%strong This request can't be merged with GitLab. You should do it manually %strong This request can't be merged with GitLab. You should do it manually
.automerge_widget.unchecked .automerge_widget.unchecked
.alert .alert.alert-warning
%strong %strong
%i.icon-refresh %i.icon-refresh
Checking for ability to automatically merge… Checking for ability to automatically merge…

4
app/views/projects/merge_requests/show/_mr_ci.html.haml
View file

@ -16,14 +16,14 @@
- [:running, :pending].each do |status| - [:running, :pending].each do |status|
.ci_widget{class: "ci-#{status}", style: "display:none"} .ci_widget{class: "ci-#{status}", style: "display:none"}
.alert .alert.alert-warning
%i.icon-time %i.icon-time
%strong CI build #{status} %strong CI build #{status}
for #{@merge_request.last_commit_short_sha}. for #{@merge_request.last_commit_short_sha}.
= link_to "Build page", ci_build_details_path(@merge_request) = link_to "Build page", ci_build_details_path(@merge_request)
.ci_widget .ci_widget
.alert .alert.alert-warning
%strong %strong
%i.icon-refresh %i.icon-refresh
Checking for CI status for #{@merge_request.last_commit_short_sha} Checking for CI status for #{@merge_request.last_commit_short_sha}