Download as
Browse Code »

Commit d7a48443ce3dae559726de4d9f5ce358877bfbcd

Authored by Dmitriy Zaporozhets
1 parent b563312c
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

alert-error to alert-danger 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 31 changed files with 33 additions and 33 deletions   Show diff stats
app/views/admin/broadcast_messages/index.html.haml
  Diff comments   View file @d7a4844
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 = form_for [:admin, @broadcast_message] do |f| 9 = form_for [:admin, @broadcast_message] do |f|
10 -if @broadcast_message.errors.any? 10 -if @broadcast_message.errors.any?
11 - .alert.alert-error 11 + .alert.alert-danger
12 - @broadcast_message.errors.full_messages.each do |msg| 12 - @broadcast_message.errors.full_messages.each do |msg|
13 %p= msg 13 %p= msg
14 .form-group 14 .form-group
app/views/admin/groups/edit.html.haml
  Diff comments   View file @d7a4844
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 %hr 2 %hr
3 = form_for [:admin, @group] do |f| 3 = form_for [:admin, @group] do |f|
4 - if @group.errors.any? 4 - if @group.errors.any?
5 - .alert.alert-error 5 + .alert.alert-danger
6 %span= @group.errors.full_messages.first 6 %span= @group.errors.full_messages.first
7 .form-group.group_name_holder 7 .form-group.group_name_holder
8 = f.label :name do 8 = f.label :name do
app/views/admin/groups/new.html.haml
  Diff comments   View file @d7a4844
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 %hr 2 %hr
3 = form_for [:admin, @group] do |f| 3 = form_for [:admin, @group] do |f|
4 - if @group.errors.any? 4 - if @group.errors.any?
5 - .alert.alert-error 5 + .alert.alert-danger
6 %span= @group.errors.full_messages.first 6 %span= @group.errors.full_messages.first
7 .form-group 7 .form-group
8 = f.label :name do 8 = f.label :name do
app/views/admin/hooks/index.html.haml
  Diff comments   View file @d7a4844
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 10
11 = form_for @hook, as: :hook, url: admin_hooks_path, html: { class: 'form-inline' } do |f| 11 = form_for @hook, as: :hook, url: admin_hooks_path, html: { class: 'form-inline' } do |f|
12 -if @hook.errors.any? 12 -if @hook.errors.any?
13 - .alert.alert-error 13 + .alert.alert-danger
14 - @hook.errors.full_messages.each do |msg| 14 - @hook.errors.full_messages.each do |msg|
15 %p= msg 15 %p= msg
16 .form-group 16 .form-group
app/views/admin/users/_form.html.haml
  Diff comments   View file @d7a4844
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 = form_for [:admin, @user] do |f| 2 = form_for [:admin, @user] do |f|
3 -if @user.errors.any? 3 -if @user.errors.any?
4 #error_explanation 4 #error_explanation
5 - %ul.unstyled.alert.alert-error 5 + %ul.unstyled.alert.alert-danger
6 - @user.errors.full_messages.each do |msg| 6 - @user.errors.full_messages.each do |msg|
7 %li= msg 7 %li= msg
8 8
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
62 .col-sm-10= f.check_box :admin 62 .col-sm-10= f.check_box :admin
63 .col-md-4 63 .col-md-4
64 - unless @user.new_record? 64 - unless @user.new_record?
65 - .alert.alert-error 65 + .alert.alert-danger
66 - if @user.blocked? 66 - if @user.blocked?
67 %p This user is blocked and is not able to login to GitLab 67 %p This user is blocked and is not able to login to GitLab
68 = link_to 'Unblock User', unblock_admin_user_path(@user), method: :put, class: "btn btn-small" 68 = link_to 'Unblock User', unblock_admin_user_path(@user), method: :put, class: "btn btn-small"
app/views/admin/users/show.html.haml
  Diff comments   View file @d7a4844
@@ -100,7 +100,7 @@ @@ -100,7 +100,7 @@
100 %li Owned groups will be left 100 %li Owned groups will be left
101 = link_to 'Block user', block_admin_user_path(@user), data: { confirm: 'USER WILL BE BLOCKED! Are you sure?' }, method: :put, class: "btn btn-remove" 101 = link_to 'Block user', block_admin_user_path(@user), data: { confirm: 'USER WILL BE BLOCKED! Are you sure?' }, method: :put, class: "btn btn-remove"
102 102
103 - .alert.alert-error 103 + .alert.alert-danger
104 %h4 104 %h4
105 Remove user 105 Remove user
106 %br 106 %br
app/views/groups/edit.html.haml
  Diff comments   View file @d7a4844
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 %div.form-holder 22 %div.form-holder
23 = form_for @group do |f| 23 = form_for @group do |f|
24 - if @group.errors.any? 24 - if @group.errors.any?
25 - .alert.alert-error 25 + .alert.alert-danger
26 %span= @group.errors.full_messages.first 26 %span= @group.errors.full_messages.first
27 .form-group 27 .form-group
28 = f.label :name do 28 = f.label :name do
app/views/groups/new.html.haml
  Diff comments   View file @d7a4844
1 = form_for @group do |f| 1 = form_for @group do |f|
2 - if @group.errors.any? 2 - if @group.errors.any?
3 - .alert.alert-error 3 + .alert.alert-danger
4 %span= @group.errors.full_messages.first 4 %span= @group.errors.full_messages.first
5 .form-group 5 .form-group
6 = f.label :name do 6 = f.label :name do
app/views/profiles/keys/_form.html.haml
  Diff comments   View file @d7a4844
1 %div 1 %div
2 = form_for [:profile, @key], html: { class: 'form-horizontal' } do |f| 2 = form_for [:profile, @key], html: { class: 'form-horizontal' } do |f|
3 - if @key.errors.any? 3 - if @key.errors.any?
4 - .alert.alert-error 4 + .alert.alert-danger
5 %ul 5 %ul
6 - @key.errors.full_messages.each do |msg| 6 - @key.errors.full_messages.each do |msg|
7 %li= msg 7 %li= msg
app/views/profiles/passwords/edit.html.haml
  Diff comments   View file @d7a4844
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 %br 10 %br
11 After a successful password update you will be redirected to login page where you should login with your new password 11 After a successful password update you will be redirected to login page where you should login with your new password
12 -if @user.errors.any? 12 -if @user.errors.any?
13 - .alert.alert-error 13 + .alert.alert-danger
14 %ul 14 %ul
15 - @user.errors.full_messages.each do |msg| 15 - @user.errors.full_messages.each do |msg|
16 %li= msg 16 %li= msg
app/views/profiles/passwords/new.html.haml
  Diff comments   View file @d7a4844
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 %br 5 %br
6 After successful password update you will be redirected to login screen 6 After successful password update you will be redirected to login screen
7 -if @user.errors.any? 7 -if @user.errors.any?
8 - .alert.alert-error 8 + .alert.alert-danger
9 %ul 9 %ul
10 - @user.errors.full_messages.each do |msg| 10 - @user.errors.full_messages.each do |msg|
11 %li= msg 11 %li= msg
app/views/profiles/show.html.haml
  Diff comments   View file @d7a4844
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 10
11 = form_for @user, url: profile_path, method: :put, html: { multipart: true, class: "edit_user form-horizontal" }, authenticity_token: true do |f| 11 = form_for @user, url: profile_path, method: :put, html: { multipart: true, class: "edit_user form-horizontal" }, authenticity_token: true do |f|
12 -if @user.errors.any? 12 -if @user.errors.any?
13 - %div.alert.alert-error 13 + %div.alert.alert-danger
14 %ul 14 %ul
15 - @user.errors.full_messages.each do |msg| 15 - @user.errors.full_messages.each do |msg|
16 %li= msg 16 %li= msg
app/views/projects/_errors.html.haml
  Diff comments   View file @d7a4844
1 - if @project.errors.any? 1 - if @project.errors.any?
2 - .alert.alert-error 2 + .alert.alert-danger
3 %button{ type: "button", class: "close", "data-dismiss" => "alert"} &times; 3 %button{ type: "button", class: "close", "data-dismiss" => "alert"} &times;
4 = @project.errors.full_messages.first 4 = @project.errors.full_messages.first
app/views/projects/commit/huge_commit.html.haml
  Diff comments   View file @d7a4844
1 = render "projects/commit/commit_box" 1 = render "projects/commit/commit_box"
2 -.alert.alert-error 2 +.alert.alert-danger
3 %h4 Commit diffs are too big to be displayed 3 %h4 Commit diffs are too big to be displayed
app/views/projects/deploy_keys/_form.html.haml
  Diff comments   View file @d7a4844
1 %div 1 %div
2 = form_for [@project, @key], url: project_deploy_keys_path do |f| 2 = form_for [@project, @key], url: project_deploy_keys_path do |f|
3 -if @key.errors.any? 3 -if @key.errors.any?
4 - .alert.alert-error 4 + .alert.alert-danger
5 %ul 5 %ul
6 - @key.errors.full_messages.each do |msg| 6 - @key.errors.full_messages.each do |msg|
7 %li= msg 7 %li= msg
app/views/projects/fork.html.haml
  Diff comments   View file @d7a4844
1 -.alert.alert-error.alert-block 1 +.alert.alert-danger.alert-block
2 %h4 2 %h4
3 %i.icon-code-fork 3 %i.icon-code-fork
4 Fork Error! 4 Fork Error!
app/views/projects/graphs/show.js.haml
  Diff comments   View file @d7a4844
@@ -16,4 +16,4 @@ @@ -16,4 +16,4 @@
16 }) 16 })
17 - else 17 - else
18 :plain 18 :plain
19 - $('.stat-graph').replaceWith('<div class="alert alert-error">Failed to load graph</div>') 19 + $('.stat-graph').replaceWith('<div class="alert alert-danger">Failed to load graph</div>')
app/views/projects/hooks/index.html.haml
  Diff comments   View file @d7a4844
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 9
10 = form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-horizontal' } do |f| 10 = form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-horizontal' } do |f|
11 -if @hook.errors.any? 11 -if @hook.errors.any?
12 - .alert.alert-error 12 + .alert.alert-danger
13 - @hook.errors.full_messages.each do |msg| 13 - @hook.errors.full_messages.each do |msg|
14 %p= msg 14 %p= msg
15 .form-group 15 .form-group
app/views/projects/issues/_form.html.haml
  Diff comments   View file @d7a4844
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 %h3.page-title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.iid}" 2 %h3.page-title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.iid}"
3 = form_for [@project, @issue] do |f| 3 = form_for [@project, @issue] do |f|
4 -if @issue.errors.any? 4 -if @issue.errors.any?
5 - .alert.alert-error 5 + .alert.alert-danger
6 - @issue.errors.full_messages.each do |msg| 6 - @issue.errors.full_messages.each do |msg|
7 %span= msg 7 %span= msg
8 %br 8 %br
app/views/projects/merge_requests/_form.html.haml
  Diff comments   View file @d7a4844
1 = form_for [@project, @merge_request], html: { class: "#{controller.action_name}-merge-request form-horizontal" } do |f| 1 = form_for [@project, @merge_request], html: { class: "#{controller.action_name}-merge-request form-horizontal" } do |f|
2 -if @merge_request.errors.any? 2 -if @merge_request.errors.any?
3 - .alert.alert-error 3 + .alert.alert-danger
4 %ul 4 %ul
5 - @merge_request.errors.full_messages.each do |msg| 5 - @merge_request.errors.full_messages.each do |msg|
6 %li= msg 6 %li= msg
app/views/projects/merge_requests/invalid.html.haml
  Diff comments   View file @d7a4844
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 = render "projects/merge_requests/show/mr_title" 2 = render "projects/merge_requests/show/mr_title"
3 = render "projects/merge_requests/show/mr_box" 3 = render "projects/merge_requests/show/mr_box"
4 4
5 - .alert.alert-error 5 + .alert.alert-danger
6 %p 6 %p
7 We cannot render this merge request properly because 7 We cannot render this merge request properly because
8 - if @merge_request.for_fork? && !@merge_request.source_project 8 - if @merge_request.for_fork? && !@merge_request.source_project
app/views/projects/merge_requests/show/_mr_accept.html.haml
  Diff comments   View file @d7a4844
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 25
26 26
27 .automerge_widget.no_satellite{style: "display:none"} 27 .automerge_widget.no_satellite{style: "display:none"}
28 - .alert.alert-error 28 + .alert.alert-danger
29 %span 29 %span
30 %strong This repository does not have satellite. Ask an administrator to fix this issue 30 %strong This repository does not have satellite. Ask an administrator to fix this issue
31 31
app/views/projects/merge_requests/show/_mr_box.html.haml
  Diff comments   View file @d7a4844
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 = markdown @merge_request.description 21 = markdown @merge_request.description
22 22
23 - if @merge_request.closed? 23 - if @merge_request.closed?
24 - .description.alert-error 24 + .description.alert-danger
25 %span 25 %span
26 %i.icon-remove 26 %i.icon-remove
27 Closed by #{link_to_member(@project, @merge_request.closed_event.author)} 27 Closed by #{link_to_member(@project, @merge_request.closed_event.author)}
app/views/projects/merge_requests/show/_mr_ci.html.haml
  Diff comments   View file @d7a4844
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 9
10 .ci_widget.ci-failed{style: "display:none"} 10 .ci_widget.ci-failed{style: "display:none"}
11 - .alert.alert-error 11 + .alert.alert-danger
12 %i.icon-remove 12 %i.icon-remove
13 %strong CI build failed 13 %strong CI build failed
14 for #{@merge_request.last_commit_short_sha}. 14 for #{@merge_request.last_commit_short_sha}.
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 Checking for CI status for #{@merge_request.last_commit_short_sha} 29 Checking for CI status for #{@merge_request.last_commit_short_sha}
30 30
31 .ci_widget.ci-error{style: "display:none"} 31 .ci_widget.ci-error{style: "display:none"}
32 - .alert.alert-error 32 + .alert.alert-danger
33 %i.icon-remove 33 %i.icon-remove
34 %strong Cannot connect to CI server. Please check your setting 34 %strong Cannot connect to CI server. Please check your setting
35 35
app/views/projects/merge_requests/show/_no_accept.html.haml
  Diff comments   View file @d7a4844
1 -.alert.alert-error 1 +.alert.alert-danger
2 %p 2 %p
3 This merge request can not be accepted because branch 3 This merge request can not be accepted because branch
4 - unless @merge_request.source_branch_exists? 4 - unless @merge_request.source_branch_exists?
app/views/projects/milestones/_form.html.haml
  Diff comments   View file @d7a4844
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 7
8 = form_for [@project, @milestone], html: {class: "new_milestone form-horizontal"} do |f| 8 = form_for [@project, @milestone], html: {class: "new_milestone form-horizontal"} do |f|
9 -if @milestone.errors.any? 9 -if @milestone.errors.any?
10 - .alert.alert-error 10 + .alert.alert-danger
11 %ul 11 %ul
12 - @milestone.errors.full_messages.each do |msg| 12 - @milestone.errors.full_messages.each do |msg|
13 %li= msg 13 %li= msg
app/views/projects/protected_branches/index.html.haml
  Diff comments   View file @d7a4844
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 - if can? current_user, :admin_project, @project 14 - if can? current_user, :admin_project, @project
15 = form_for [@project, @protected_branch] do |f| 15 = form_for [@project, @protected_branch] do |f|
16 -if @protected_branch.errors.any? 16 -if @protected_branch.errors.any?
17 - .alert.alert-error 17 + .alert.alert-danger
18 %ul 18 %ul
19 - @protected_branch.errors.full_messages.each do |msg| 19 - @protected_branch.errors.full_messages.each do |msg|
20 %li= msg 20 %li= msg
app/views/projects/services/_form.html.haml
  Diff comments   View file @d7a4844
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 12
13 = form_for(@service, as: :service, url: project_service_path(@project, @service.to_param), method: :put) do |f| 13 = form_for(@service, as: :service, url: project_service_path(@project, @service.to_param), method: :put) do |f|
14 - if @service.errors.any? 14 - if @service.errors.any?
15 - .alert.alert-error 15 + .alert.alert-danger
16 %ul 16 %ul
17 - @service.errors.full_messages.each do |msg| 17 - @service.errors.full_messages.each do |msg|
18 %li= msg 18 %li= msg
app/views/projects/snippets/_form.html.haml
  Diff comments   View file @d7a4844
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 .snippet-form-holder 4 .snippet-form-holder
5 = form_for [@project, @snippet], as: :project_snippet, url: url do |f| 5 = form_for [@project, @snippet], as: :project_snippet, url: url do |f|
6 -if @snippet.errors.any? 6 -if @snippet.errors.any?
7 - .alert.alert-error 7 + .alert.alert-danger
8 %ul 8 %ul
9 - @snippet.errors.full_messages.each do |msg| 9 - @snippet.errors.full_messages.each do |msg|
10 %li= msg 10 %li= msg
app/views/projects/team_members/_form.html.haml
  Diff comments   View file @d7a4844
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 3
4 = form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f| 4 = form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f|
5 -if @user_project_relation.errors.any? 5 -if @user_project_relation.errors.any?
6 - .alert.alert-error 6 + .alert.alert-danger
7 %ul 7 %ul
8 - @user_project_relation.errors.full_messages.each do |msg| 8 - @user_project_relation.errors.full_messages.each do |msg|
9 %li= msg 9 %li= msg
app/views/snippets/_form.html.haml
  Diff comments   View file @d7a4844
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 .snippet-form-holder 4 .snippet-form-holder
5 = form_for @snippet, as: :personal_snippet, url: url do |f| 5 = form_for @snippet, as: :personal_snippet, url: url do |f|
6 -if @snippet.errors.any? 6 -if @snippet.errors.any?
7 - .alert.alert-error 7 + .alert.alert-danger
8 %ul 8 %ul
9 - @snippet.errors.full_messages.each do |msg| 9 - @snippet.errors.full_messages.each do |msg|
10 %li= msg 10 %li= msg