summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-31 16:34:14 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-31 16:34:14 +0200
commitd7a48443ce3dae559726de4d9f5ce358877bfbcd (patch)
tree8201828bafc9c8267816a37038af72d72288ffb2
parentb563312c2f59c04d535aa798e5cdfa8596f22dee (diff)
downloadgitlab-ce-d7a48443ce3dae559726de4d9f5ce358877bfbcd.tar.gz
alert-error to alert-danger
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/views/admin/broadcast_messages/index.html.haml2
-rw-r--r--app/views/admin/groups/edit.html.haml2
-rw-r--r--app/views/admin/groups/new.html.haml2
-rw-r--r--app/views/admin/hooks/index.html.haml2
-rw-r--r--app/views/admin/users/_form.html.haml4
-rw-r--r--app/views/admin/users/show.html.haml2
-rw-r--r--app/views/groups/edit.html.haml2
-rw-r--r--app/views/groups/new.html.haml2
-rw-r--r--app/views/profiles/keys/_form.html.haml2
-rw-r--r--app/views/profiles/passwords/edit.html.haml2
-rw-r--r--app/views/profiles/passwords/new.html.haml2
-rw-r--r--app/views/profiles/show.html.haml2
-rw-r--r--app/views/projects/_errors.html.haml2
-rw-r--r--app/views/projects/commit/huge_commit.html.haml2
-rw-r--r--app/views/projects/deploy_keys/_form.html.haml2
-rw-r--r--app/views/projects/fork.html.haml2
-rw-r--r--app/views/projects/graphs/show.js.haml2
-rw-r--r--app/views/projects/hooks/index.html.haml2
-rw-r--r--app/views/projects/issues/_form.html.haml2
-rw-r--r--app/views/projects/merge_requests/_form.html.haml2
-rw-r--r--app/views/projects/merge_requests/invalid.html.haml2
-rw-r--r--app/views/projects/merge_requests/show/_mr_accept.html.haml2
-rw-r--r--app/views/projects/merge_requests/show/_mr_box.html.haml2
-rw-r--r--app/views/projects/merge_requests/show/_mr_ci.html.haml4
-rw-r--r--app/views/projects/merge_requests/show/_no_accept.html.haml2
-rw-r--r--app/views/projects/milestones/_form.html.haml2
-rw-r--r--app/views/projects/protected_branches/index.html.haml2
-rw-r--r--app/views/projects/services/_form.html.haml2
-rw-r--r--app/views/projects/snippets/_form.html.haml2
-rw-r--r--app/views/projects/team_members/_form.html.haml2
-rw-r--r--app/views/snippets/_form.html.haml2
31 files changed, 33 insertions, 33 deletions
diff --git a/app/views/admin/broadcast_messages/index.html.haml b/app/views/admin/broadcast_messages/index.html.haml
index 204b8cdd696..f265a6254dd 100644
--- a/app/views/admin/broadcast_messages/index.html.haml
+++ b/app/views/admin/broadcast_messages/index.html.haml
@@ -8,7 +8,7 @@
= form_for [:admin, @broadcast_message] do |f|
-if @broadcast_message.errors.any?
- .alert.alert-error
+ .alert.alert-danger
- @broadcast_message.errors.full_messages.each do |msg|
%p= msg
.form-group
diff --git a/app/views/admin/groups/edit.html.haml b/app/views/admin/groups/edit.html.haml
index 8183454c763..e68c97e2c59 100644
--- a/app/views/admin/groups/edit.html.haml
+++ b/app/views/admin/groups/edit.html.haml
@@ -2,7 +2,7 @@
%hr
= form_for [:admin, @group] do |f|
- if @group.errors.any?
- .alert.alert-error
+ .alert.alert-danger
%span= @group.errors.full_messages.first
.form-group.group_name_holder
= f.label :name do
diff --git a/app/views/admin/groups/new.html.haml b/app/views/admin/groups/new.html.haml
index 301e9a61cbf..644879c65e4 100644
--- a/app/views/admin/groups/new.html.haml
+++ b/app/views/admin/groups/new.html.haml
@@ -2,7 +2,7 @@
%hr
= form_for [:admin, @group] do |f|
- if @group.errors.any?
- .alert.alert-error
+ .alert.alert-danger
%span= @group.errors.full_messages.first
.form-group
= f.label :name do
diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml
index 0192cd0eb82..560e6182439 100644
--- a/app/views/admin/hooks/index.html.haml
+++ b/app/views/admin/hooks/index.html.haml
@@ -10,7 +10,7 @@
= form_for @hook, as: :hook, url: admin_hooks_path, html: { class: 'form-inline' } do |f|
-if @hook.errors.any?
- .alert.alert-error
+ .alert.alert-danger
- @hook.errors.full_messages.each do |msg|
%p= msg
.form-group
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index fc9b2d250a5..a9fb62c9b96 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -2,7 +2,7 @@
= form_for [:admin, @user] do |f|
-if @user.errors.any?
#error_explanation
- %ul.unstyled.alert.alert-error
+ %ul.unstyled.alert.alert-danger
- @user.errors.full_messages.each do |msg|
%li= msg
@@ -62,7 +62,7 @@
.col-sm-10= f.check_box :admin
.col-md-4
- unless @user.new_record?
- .alert.alert-error
+ .alert.alert-danger
- if @user.blocked?
%p This user is blocked and is not able to login to GitLab
= link_to 'Unblock User', unblock_admin_user_path(@user), method: :put, class: "btn btn-small"
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index 71c12a18783..bd276f22221 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -100,7 +100,7 @@
%li Owned groups will be left
= link_to 'Block user', block_admin_user_path(@user), data: { confirm: 'USER WILL BE BLOCKED! Are you sure?' }, method: :put, class: "btn btn-remove"
- .alert.alert-error
+ .alert.alert-danger
%h4
Remove user
%br
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index 550c060da1f..c5ae284ef7e 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -22,7 +22,7 @@
%div.form-holder
= form_for @group do |f|
- if @group.errors.any?
- .alert.alert-error
+ .alert.alert-danger
%span= @group.errors.full_messages.first
.form-group
= f.label :name do
diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml
index 7086630f515..0147cc7e9e1 100644
--- a/app/views/groups/new.html.haml
+++ b/app/views/groups/new.html.haml
@@ -1,6 +1,6 @@
= form_for @group do |f|
- if @group.errors.any?
- .alert.alert-error
+ .alert.alert-danger
%span= @group.errors.full_messages.first
.form-group
= f.label :name do
diff --git a/app/views/profiles/keys/_form.html.haml b/app/views/profiles/keys/_form.html.haml
index 54d64057922..f905417f0e2 100644
--- a/app/views/profiles/keys/_form.html.haml
+++ b/app/views/profiles/keys/_form.html.haml
@@ -1,7 +1,7 @@
%div
= form_for [:profile, @key], html: { class: 'form-horizontal' } do |f|
- if @key.errors.any?
- .alert.alert-error
+ .alert.alert-danger
%ul
- @key.errors.full_messages.each do |msg|
%li= msg
diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml
index 72f6521d92b..fd3d0ac09d4 100644
--- a/app/views/profiles/passwords/edit.html.haml
+++ b/app/views/profiles/passwords/edit.html.haml
@@ -10,7 +10,7 @@
%br
After a successful password update you will be redirected to login page where you should login with your new password
-if @user.errors.any?
- .alert.alert-error
+ .alert.alert-danger
%ul
- @user.errors.full_messages.each do |msg|
%li= msg
diff --git a/app/views/profiles/passwords/new.html.haml b/app/views/profiles/passwords/new.html.haml
index fc2c85df9b9..f333879cf6c 100644
--- a/app/views/profiles/passwords/new.html.haml
+++ b/app/views/profiles/passwords/new.html.haml
@@ -5,7 +5,7 @@
%br
After successful password update you will be redirected to login screen
-if @user.errors.any?
- .alert.alert-error
+ .alert.alert-danger
%ul
- @user.errors.full_messages.each do |msg|
%li= msg
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index a97e748da65..73d90fe9f45 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -10,7 +10,7 @@
= form_for @user, url: profile_path, method: :put, html: { multipart: true, class: "edit_user form-horizontal" }, authenticity_token: true do |f|
-if @user.errors.any?
- %div.alert.alert-error
+ %div.alert.alert-danger
%ul
- @user.errors.full_messages.each do |msg|
%li= msg
diff --git a/app/views/projects/_errors.html.haml b/app/views/projects/_errors.html.haml
index bb9759353a3..7c8bb33ed7e 100644
--- a/app/views/projects/_errors.html.haml
+++ b/app/views/projects/_errors.html.haml
@@ -1,4 +1,4 @@
- if @project.errors.any?
- .alert.alert-error
+ .alert.alert-danger
%button{ type: "button", class: "close", "data-dismiss" => "alert"} &times;
= @project.errors.full_messages.first
diff --git a/app/views/projects/commit/huge_commit.html.haml b/app/views/projects/commit/huge_commit.html.haml
index 210d8d9e207..398ce771426 100644
--- a/app/views/projects/commit/huge_commit.html.haml
+++ b/app/views/projects/commit/huge_commit.html.haml
@@ -1,3 +1,3 @@
= render "projects/commit/commit_box"
-.alert.alert-error
+.alert.alert-danger
%h4 Commit diffs are too big to be displayed
diff --git a/app/views/projects/deploy_keys/_form.html.haml b/app/views/projects/deploy_keys/_form.html.haml
index 5ee4aae54eb..3507c3c1cdb 100644
--- a/app/views/projects/deploy_keys/_form.html.haml
+++ b/app/views/projects/deploy_keys/_form.html.haml
@@ -1,7 +1,7 @@
%div
= form_for [@project, @key], url: project_deploy_keys_path do |f|
-if @key.errors.any?
- .alert.alert-error
+ .alert.alert-danger
%ul
- @key.errors.full_messages.each do |msg|
%li= msg
diff --git a/app/views/projects/fork.html.haml b/app/views/projects/fork.html.haml
index 227fde8a735..bdd75de447a 100644
--- a/app/views/projects/fork.html.haml
+++ b/app/views/projects/fork.html.haml
@@ -1,4 +1,4 @@
-.alert.alert-error.alert-block
+.alert.alert-danger.alert-block
%h4
%i.icon-code-fork
Fork Error!
diff --git a/app/views/projects/graphs/show.js.haml b/app/views/projects/graphs/show.js.haml
index 43e776e5330..dcf6cacdceb 100644
--- a/app/views/projects/graphs/show.js.haml
+++ b/app/views/projects/graphs/show.js.haml
@@ -16,4 +16,4 @@
})
- else
:plain
- $('.stat-graph').replaceWith('<div class="alert alert-error">Failed to load graph</div>')
+ $('.stat-graph').replaceWith('<div class="alert alert-danger">Failed to load graph</div>')
diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml
index 5c9705b9427..dac6a698bdc 100644
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
@@ -9,7 +9,7 @@
= form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-horizontal' } do |f|
-if @hook.errors.any?
- .alert.alert-error
+ .alert.alert-danger
- @hook.errors.full_messages.each do |msg|
%p= msg
.form-group
diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml
index c51dbf820e7..b22f77775c9 100644
--- a/app/views/projects/issues/_form.html.haml
+++ b/app/views/projects/issues/_form.html.haml
@@ -2,7 +2,7 @@
%h3.page-title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.iid}"
= form_for [@project, @issue] do |f|
-if @issue.errors.any?
- .alert.alert-error
+ .alert.alert-danger
- @issue.errors.full_messages.each do |msg|
%span= msg
%br
diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml
index 098596ff845..4ca319e5eb2 100644
--- a/app/views/projects/merge_requests/_form.html.haml
+++ b/app/views/projects/merge_requests/_form.html.haml
@@ -1,6 +1,6 @@
= form_for [@project, @merge_request], html: { class: "#{controller.action_name}-merge-request form-horizontal" } do |f|
-if @merge_request.errors.any?
- .alert.alert-error
+ .alert.alert-danger
%ul
- @merge_request.errors.full_messages.each do |msg|
%li= msg
diff --git a/app/views/projects/merge_requests/invalid.html.haml b/app/views/projects/merge_requests/invalid.html.haml
index 16e9fee42a2..b9c466657de 100644
--- a/app/views/projects/merge_requests/invalid.html.haml
+++ b/app/views/projects/merge_requests/invalid.html.haml
@@ -2,7 +2,7 @@
= render "projects/merge_requests/show/mr_title"
= render "projects/merge_requests/show/mr_box"
- .alert.alert-error
+ .alert.alert-danger
%p
We cannot render this merge request properly because
- if @merge_request.for_fork? && !@merge_request.source_project
diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml
index bd29de895d5..5a6b6a5ff90 100644
--- a/app/views/projects/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml
@@ -25,7 +25,7 @@
.automerge_widget.no_satellite{style: "display:none"}
- .alert.alert-error
+ .alert.alert-danger
%span
%strong This repository does not have satellite. Ask an administrator to fix this issue
diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml
index fa41db99cd7..b4f648ab197 100644
--- a/app/views/projects/merge_requests/show/_mr_box.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_box.html.haml
@@ -21,7 +21,7 @@
= markdown @merge_request.description
- if @merge_request.closed?
- .description.alert-error
+ .description.alert-danger
%span
%i.icon-remove
Closed by #{link_to_member(@project, @merge_request.closed_event.author)}
diff --git a/app/views/projects/merge_requests/show/_mr_ci.html.haml b/app/views/projects/merge_requests/show/_mr_ci.html.haml
index 9b15c4526e9..f18fe8c80c4 100644
--- a/app/views/projects/merge_requests/show/_mr_ci.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_ci.html.haml
@@ -8,7 +8,7 @@
.ci_widget.ci-failed{style: "display:none"}
- .alert.alert-error
+ .alert.alert-danger
%i.icon-remove
%strong CI build failed
for #{@merge_request.last_commit_short_sha}.
@@ -29,7 +29,7 @@
Checking for CI status for #{@merge_request.last_commit_short_sha}
.ci_widget.ci-error{style: "display:none"}
- .alert.alert-error
+ .alert.alert-danger
%i.icon-remove
%strong Cannot connect to CI server. Please check your setting
diff --git a/app/views/projects/merge_requests/show/_no_accept.html.haml b/app/views/projects/merge_requests/show/_no_accept.html.haml
index a0507b24ad8..203e2612de4 100644
--- a/app/views/projects/merge_requests/show/_no_accept.html.haml
+++ b/app/views/projects/merge_requests/show/_no_accept.html.haml
@@ -1,4 +1,4 @@
-.alert.alert-error
+.alert.alert-danger
%p
This merge request can not be accepted because branch
- unless @merge_request.source_branch_exists?
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml
index a3dc9d8c9cb..10e43a58508 100644
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
@@ -7,7 +7,7 @@
= form_for [@project, @milestone], html: {class: "new_milestone form-horizontal"} do |f|
-if @milestone.errors.any?
- .alert.alert-error
+ .alert.alert-danger
%ul
- @milestone.errors.full_messages.each do |msg|
%li= msg
diff --git a/app/views/projects/protected_branches/index.html.haml b/app/views/projects/protected_branches/index.html.haml
index 4ecd682113d..3533d4d23bc 100644
--- a/app/views/projects/protected_branches/index.html.haml
+++ b/app/views/projects/protected_branches/index.html.haml
@@ -14,7 +14,7 @@
- if can? current_user, :admin_project, @project
= form_for [@project, @protected_branch] do |f|
-if @protected_branch.errors.any?
- .alert.alert-error
+ .alert.alert-danger
%ul
- @protected_branch.errors.full_messages.each do |msg|
%li= msg
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index 5f5a1bb9b67..a6f87c93169 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -12,7 +12,7 @@
= form_for(@service, as: :service, url: project_service_path(@project, @service.to_param), method: :put) do |f|
- if @service.errors.any?
- .alert.alert-error
+ .alert.alert-danger
%ul
- @service.errors.full_messages.each do |msg|
%li= msg
diff --git a/app/views/projects/snippets/_form.html.haml b/app/views/projects/snippets/_form.html.haml
index b37bee98f3f..4b79cab8656 100644
--- a/app/views/projects/snippets/_form.html.haml
+++ b/app/views/projects/snippets/_form.html.haml
@@ -4,7 +4,7 @@
.snippet-form-holder
= form_for [@project, @snippet], as: :project_snippet, url: url do |f|
-if @snippet.errors.any?
- .alert.alert-error
+ .alert.alert-danger
%ul
- @snippet.errors.full_messages.each do |msg|
%li= msg
diff --git a/app/views/projects/team_members/_form.html.haml b/app/views/projects/team_members/_form.html.haml
index f7f609e5452..6673d44eb1a 100644
--- a/app/views/projects/team_members/_form.html.haml
+++ b/app/views/projects/team_members/_form.html.haml
@@ -3,7 +3,7 @@
= form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f|
-if @user_project_relation.errors.any?
- .alert.alert-error
+ .alert.alert-danger
%ul
- @user_project_relation.errors.full_messages.each do |msg|
%li= msg
diff --git a/app/views/snippets/_form.html.haml b/app/views/snippets/_form.html.haml
index 1bed2bdc90e..210277f436d 100644
--- a/app/views/snippets/_form.html.haml
+++ b/app/views/snippets/_form.html.haml
@@ -4,7 +4,7 @@
.snippet-form-holder
= form_for @snippet, as: :personal_snippet, url: url do |f|
-if @snippet.errors.any?
- .alert.alert-error
+ .alert.alert-danger
%ul
- @snippet.errors.full_messages.each do |msg|
%li= msg