Download as
Browse Code »

Commit b742f47e89674c7aaae78b6e4174339480594d1f

Authored by Dmitriy Zaporozhets
1 parent e2fb18a3
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

remove old alert messages

Showing 35 changed files with 42 additions and 36 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
  Diff comments   View file @b742f47
@@ -67,6 +67,7 @@ @@ -67,6 +67,7 @@
67 @extend .btn-primary; 67 @extend .btn-primary;
68 } 68 }
69 69
  70 + &.btn-close,
70 &.btn-remove { 71 &.btn-remove {
71 @extend .btn-danger; 72 @extend .btn-danger;
72 border-color: #BD362F; 73 border-color: #BD362F;
app/assets/stylesheets/gitlab_bootstrap/common.scss
  Diff comments   View file @b742f47
@@ -86,9 +86,14 @@ @@ -86,9 +86,14 @@
86 86
87 /** ALERT MESSAGES **/ 87 /** ALERT MESSAGES **/
88 .alert-message { @extend .alert; } 88 .alert-message { @extend .alert; }
89 -.alert-messag.success { @extend .alert-success; }  
90 .alert-message.error { @extend .alert-error; } 89 .alert-message.error { @extend .alert-error; }
91 90
  91 +.alert.alert-disabled {
  92 + background: #EEE;
  93 + color: #777;
  94 + border-color: #DDD;
  95 +}
  96 +
92 /** AVATARS **/ 97 /** AVATARS **/
93 img.avatar { float: left; margin-right: 12px; width: 40px; border: 1px solid #ddd; padding: 1px; } 98 img.avatar { float: left; margin-right: 12px; width: 40px; border: 1px solid #ddd; padding: 1px; }
94 img.avatar.s16 { width: 16px; height: 16px; margin-right: 6px; } 99 img.avatar.s16 { width: 16px; height: 16px; margin-right: 6px; }
app/views/admin/groups/edit.html.haml
  Diff comments   View file @b742f47
@@ -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-message.block-message.error 5 + .alert.alert-error
6 %span= @group.errors.full_messages.first 6 %span= @group.errors.full_messages.first
7 .clearfix.group_name_holder 7 .clearfix.group_name_holder
8 = f.label :name do 8 = f.label :name do
app/views/admin/groups/new.html.haml
  Diff comments   View file @b742f47
@@ -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-message.block-message.error 5 + .alert.alert-error
6 %span= @group.errors.full_messages.first 6 %span= @group.errors.full_messages.first
7 .clearfix 7 .clearfix
8 = f.label :name do 8 = f.label :name do
app/views/admin/hooks/index.html.haml
  Diff comments   View file @b742f47
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 7
8 = form_for @hook, as: :hook, url: admin_hooks_path, html: { class: 'form-inline' } do |f| 8 = form_for @hook, as: :hook, url: admin_hooks_path, html: { class: 'form-inline' } do |f|
9 -if @hook.errors.any? 9 -if @hook.errors.any?
10 - .alert-message.block-message.error 10 + .alert.alert-error
11 - @hook.errors.full_messages.each do |msg| 11 - @hook.errors.full_messages.each do |msg|
12 %p= msg 12 %p= msg
13 .clearfix 13 .clearfix
app/views/admin/projects/_form.html.haml
  Diff comments   View file @b742f47
1 = form_for [:admin, project] do |f| 1 = form_for [:admin, project] do |f|
2 -if project.errors.any? 2 -if project.errors.any?
3 - .alert-message.block-message.error 3 + .alert.alert-error
4 %ul 4 %ul
5 - project.errors.full_messages.each do |msg| 5 - project.errors.full_messages.each do |msg|
6 %li= msg 6 %li= msg
app/views/admin/projects/members/_form.html.haml
  Diff comments   View file @b742f47
1 = form_for @team_member_relation, as: :team_member, url: admin_project_member_path(@project, @member) do |f| 1 = form_for @team_member_relation, as: :team_member, url: admin_project_member_path(@project, @member) do |f|
2 -if @team_member_relation.errors.any? 2 -if @team_member_relation.errors.any?
3 - .alert-message.block-message.error 3 + .alert.alert-error
4 %ul 4 %ul
5 - @team_member_relation.errors.full_messages.each do |msg| 5 - @team_member_relation.errors.full_messages.each do |msg|
6 %li= msg 6 %li= msg
app/views/admin/teams/edit.html.haml
  Diff comments   View file @b742f47
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 %hr 2 %hr
3 = form_for @team, url: admin_team_path(@team), method: :put do |f| 3 = form_for @team, url: admin_team_path(@team), method: :put do |f|
4 - if @team.errors.any? 4 - if @team.errors.any?
5 - .alert-message.block-message.error 5 + .alert.alert-error
6 %span= @team.errors.full_messages.first 6 %span= @team.errors.full_messages.first
7 .clearfix.team_name_holder 7 .clearfix.team_name_holder
8 = f.label :name do 8 = f.label :name do
app/views/admin/teams/members/_form.html.haml
  Diff comments   View file @b742f47
1 = form_tag admin_team_member_path(@team, @member), method: :put do 1 = form_tag admin_team_member_path(@team, @member), method: :put do
2 -if @member.errors.any? 2 -if @member.errors.any?
3 - .alert-message.block-message.error 3 + .alert.alert-error
4 %ul 4 %ul
5 - @member.errors.full_messages.each do |msg| 5 - @member.errors.full_messages.each do |msg|
6 %li= msg 6 %li= msg
app/views/admin/teams/new.html.haml
  Diff comments   View file @b742f47
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 %hr 2 %hr
3 = form_for @team, url: admin_teams_path do |f| 3 = form_for @team, url: admin_teams_path do |f|
4 - if @team.errors.any? 4 - if @team.errors.any?
5 - .alert-message.block-message.error 5 + .alert.alert-error
6 %span= @team.errors.full_messages.first 6 %span= @team.errors.full_messages.first
7 .clearfix 7 .clearfix
8 = f.label :name do 8 = f.label :name do
app/views/admin/teams/projects/_form.html.haml
  Diff comments   View file @b742f47
1 = form_tag admin_team_project_path(@team, @project), method: :put do 1 = form_tag admin_team_project_path(@team, @project), method: :put do
2 -if @project.errors.any? 2 -if @project.errors.any?
3 - .alert-message.block-message.error 3 + .alert.alert-error
4 %ul 4 %ul
5 - @project.errors.full_messages.each do |msg| 5 - @project.errors.full_messages.each do |msg|
6 %li= msg 6 %li= msg
app/views/commit/huge_commit.html.haml
  Diff comments   View file @b742f47
1 = render "commits/commit_box" 1 = render "commits/commit_box"
2 -.alert-message.block-message.error 2 +.alert.alert-error
3 %h4 Commit diffs are too big to be displayed 3 %h4 Commit diffs are too big to be displayed
app/views/commits/_diffs.html.haml
  Diff comments   View file @b742f47
1 - if @suppress_diff 1 - if @suppress_diff
2 - .alert-message.block-message 2 + .alert.alert-block
3 %p 3 %p
4 %strong Warning! Large commit with more then #{Commit::DIFF_SAFE_SIZE} files changed. 4 %strong Warning! Large commit with more then #{Commit::DIFF_SAFE_SIZE} files changed.
5 %p To prevent performance issue we rejected diff information. 5 %p To prevent performance issue we rejected diff information.
app/views/deploy_keys/_form.html.haml
  Diff comments   View file @b742f47
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-message.block-message.error 4 + .alert.alert-error
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/groups/new.html.haml
  Diff comments   View file @b742f47
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 %hr 2 %hr
3 = form_for @group do |f| 3 = form_for @group do |f|
4 - if @group.errors.any? 4 - if @group.errors.any?
5 - .alert-message.block-message.error 5 + .alert.alert-error
6 %span= @group.errors.full_messages.first 6 %span= @group.errors.full_messages.first
7 .clearfix 7 .clearfix
8 = f.label :name do 8 = f.label :name do
app/views/hooks/index.html.haml
  Diff comments   View file @b742f47
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 10
11 = form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-inline' } do |f| 11 = form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-inline' } do |f|
12 -if @hook.errors.any? 12 -if @hook.errors.any?
13 - .alert-message.block-message.error 13 + .alert.alert-error
14 - @hook.errors.full_messages.each do |msg| 14 - @hook.errors.full_messages.each do |msg|
15 %p= msg 15 %p= msg
16 .clearfix 16 .clearfix
app/views/issues/_form.html.haml
  Diff comments   View file @b742f47
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 %h3.page_title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}" 2 %h3.page_title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
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-message.block-message.error 5 + .alert.alert-error
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/keys/_form.html.haml
  Diff comments   View file @b742f47
1 %div 1 %div
2 = form_for @key do |f| 2 = form_for @key do |f|
3 -if @key.errors.any? 3 -if @key.errors.any?
4 - .alert-message.block-message.error 4 + .alert.alert-error
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/merge_requests/_form.html.haml
  Diff comments   View file @b742f47
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-message.block-message.error 3 + .alert.alert-error
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/merge_requests/show/_mr_accept.html.haml
  Diff comments   View file @b742f47
1 - unless can?(current_user, :accept_mr, @project) 1 - unless can?(current_user, :accept_mr, @project)
2 - .alert-message 2 + .alert
3 %strong Only masters can accept MR 3 %strong Only masters can accept MR
4 4
5 5
@@ -29,14 +29,14 @@ @@ -29,14 +29,14 @@
29 %strong This repository does not have satellite. Ask administrator to fix this issue 29 %strong This repository does not have satellite. Ask administrator to fix this issue
30 30
31 .automerge_widget.cannot_be_merged{style: "display:none"} 31 .automerge_widget.cannot_be_merged{style: "display:none"}
32 - .alert.alert-info 32 + .alert.alert-disabled
33 %span 33 %span
34 = link_to "Show how to merge", "#", class: "how_to_merge_link btn btn-small padded", title: "How To Merge" 34 = link_to "Show how to merge", "#", class: "how_to_merge_link btn btn-small padded", title: "How To Merge"
35   35  
36 %strong This request can't be merged with GitLab. You should do it manually 36 %strong This request can't be merged with GitLab. You should do it manually
37 37
38 .automerge_widget.unchecked 38 .automerge_widget.unchecked
39 - .alert-message 39 + .alert
40 %strong 40 %strong
41 %i.icon-refresh 41 %i.icon-refresh
42 Checking for ability to automatically merge… 42 Checking for ability to automatically merge…
app/views/merge_requests/show/_mr_ci.html.haml
  Diff comments   View file @b742f47
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 = link_to "Build page", ci_build_details_path(@merge_request) 23 = link_to "Build page", ci_build_details_path(@merge_request)
24 24
25 .ci_widget 25 .ci_widget
26 - .alert-message 26 + .alert
27 %strong 27 %strong
28 %i.icon-refresh 28 %i.icon-refresh
29 Checking for CI status for #{@merge_request.last_commit_short_sha} 29 Checking for CI status for #{@merge_request.last_commit_short_sha}
app/views/merge_requests/show/_mr_title.html.haml
  Diff comments   View file @b742f47
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 %li= link_to "Email Patches", project_merge_request_path(@project, @merge_request, format: :patch) 17 %li= link_to "Email Patches", project_merge_request_path(@project, @merge_request, format: :patch)
18 %li= link_to "Plain Diff", project_merge_request_path(@project, @merge_request, format: :diff) 18 %li= link_to "Plain Diff", project_merge_request_path(@project, @merge_request, format: :diff)
19 19
20 - = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {closed: true }, status_only: true), method: :put, class: "btn grouped danger", title: "Close merge request" 20 + = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {closed: true }, status_only: true), method: :put, class: "btn grouped btn-close", title: "Close merge request"
21 21
22 = link_to edit_project_merge_request_path(@project, @merge_request), class: "btn grouped" do 22 = link_to edit_project_merge_request_path(@project, @merge_request), class: "btn grouped" do
23 %i.icon-edit 23 %i.icon-edit
app/views/milestones/_form.html.haml
  Diff comments   View file @b742f47
@@ -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-message.block-message.error 10 + .alert.alert-error
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/profiles/account.html.haml
  Diff comments   View file @b742f47
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 .padded 35 .padded
36 %p.slead After successful password update you will be redirected to login page where you should login with new password 36 %p.slead After successful password update you will be redirected to login page where you should login with new password
37 -if @user.errors.any? 37 -if @user.errors.any?
38 - .alert-message.block-message.error 38 + .alert.alert-error
39 %ul 39 %ul
40 - @user.errors.full_messages.each do |msg| 40 - @user.errors.full_messages.each do |msg|
41 %li= msg 41 %li= msg
app/views/profiles/show.html.haml
  Diff comments   View file @b742f47
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 15
16 = form_for @user, url: profile_path, method: :put, html: { class: "edit_user form-horizontal" } do |f| 16 = form_for @user, url: profile_path, method: :put, html: { class: "edit_user form-horizontal" } do |f|
17 -if @user.errors.any? 17 -if @user.errors.any?
18 - %div.alert-message.block-message.error 18 + %div.alert.alert-error
19 %ul 19 %ul
20 - @user.errors.full_messages.each do |msg| 20 - @user.errors.full_messages.each do |msg|
21 %li= msg 21 %li= msg
app/views/projects/_form.html.haml
  Diff comments   View file @b742f47
1 = form_for(@project, remote: true) do |f| 1 = form_for(@project, remote: true) do |f|
2 - if @project.errors.any? 2 - if @project.errors.any?
3 - .alert-message.block-message.error 3 + .alert.alert-error
4 %ul 4 %ul
5 - @project.errors.full_messages.each do |msg| 5 - @project.errors.full_messages.each do |msg|
6 %li= msg 6 %li= msg
app/views/projects/_new_form.html.haml
  Diff comments   View file @b742f47
1 = form_for(@project, remote: true) do |f| 1 = form_for(@project, remote: true) do |f|
2 - if @project.errors.any? 2 - if @project.errors.any?
3 - .alert-message.block-message.error 3 + .alert.alert-error
4 %span= @project.errors.full_messages.first 4 %span= @project.errors.full_messages.first
5 .clearfix.project_name_holder 5 .clearfix.project_name_holder
6 = f.label :name do 6 = f.label :name do
app/views/protected_branches/index.html.haml
  Diff comments   View file @b742f47
@@ -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-message.block-message.error 17 + .alert.alert-error
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/services/_gitlab_ci.html.haml
  Diff comments   View file @b742f47
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 %hr 16 %hr
17 = form_for(@service, :as => :service, :url => project_service_path(@project, :gitlab_ci), :method => :put) do |f| 17 = form_for(@service, :as => :service, :url => project_service_path(@project, :gitlab_ci), :method => :put) do |f|
18 - if @service.errors.any? 18 - if @service.errors.any?
19 - .alert-message.block-message.error 19 + .alert.alert-error
20 %ul 20 %ul
21 - @service.errors.full_messages.each do |msg| 21 - @service.errors.full_messages.each do |msg|
22 %li= msg 22 %li= msg
app/views/snippets/_form.html.haml
  Diff comments   View file @b742f47
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 .snippet-form-holder 4 .snippet-form-holder
5 = form_for [@project, @snippet] do |f| 5 = form_for [@project, @snippet] do |f|
6 -if @snippet.errors.any? 6 -if @snippet.errors.any?
7 - .alert-message.block-message.error 7 + .alert.alert-error
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/team_members/_form.html.haml
  Diff comments   View file @b742f47
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 %hr 3 %hr
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-message.block-message.error 6 + .alert.alert-error
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/teams/edit.html.haml
  Diff comments   View file @b742f47
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 %hr 2 %hr
3 = form_for @team, url: teams_path do |f| 3 = form_for @team, url: teams_path do |f|
4 - if @team.errors.any? 4 - if @team.errors.any?
5 - .alert-message.block-message.error 5 + .alert.alert-error
6 %span= @team.errors.full_messages.first 6 %span= @team.errors.full_messages.first
7 .clearfix 7 .clearfix
8 = f.label :name do 8 = f.label :name do
app/views/teams/members/_form.html.haml
  Diff comments   View file @b742f47
1 = form_tag admin_team_member_path(@team, @member), method: :put do 1 = form_tag admin_team_member_path(@team, @member), method: :put do
2 -if @member.errors.any? 2 -if @member.errors.any?
3 - .alert-message.block-message.error 3 + .alert.alert-error
4 %ul 4 %ul
5 - @member.errors.full_messages.each do |msg| 5 - @member.errors.full_messages.each do |msg|
6 %li= msg 6 %li= msg
app/views/teams/new.html.haml
  Diff comments   View file @b742f47
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 %hr 2 %hr
3 = form_for @team, url: teams_path do |f| 3 = form_for @team, url: teams_path do |f|
4 - if @team.errors.any? 4 - if @team.errors.any?
5 - .alert-message.block-message.error 5 + .alert.alert-error
6 %span= @team.errors.full_messages.first 6 %span= @team.errors.full_messages.first
7 .clearfix 7 .clearfix
8 = f.label :name do 8 = f.label :name do
app/views/teams/projects/_form.html.haml
  Diff comments   View file @b742f47
1 = form_tag team_project_path(@team, @project), method: :put do 1 = form_tag team_project_path(@team, @project), method: :put do
2 -if @project.errors.any? 2 -if @project.errors.any?
3 - .alert-message.block-message.error 3 + .alert.alert-error
4 %ul 4 %ul
5 - @project.errors.full_messages.each do |msg| 5 - @project.errors.full_messages.each do |msg|
6 %li= msg 6 %li= msg