BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
d7a48443
Unverified
Commit
d7a48443
authored
Dec 31, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
alert-error to alert-danger
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
b563312c
Hide whitespace changes
Inline
Side-by-side
Showing
31 changed files
with
33 additions
and
33 deletions
+33
-33
index.html.haml
app/views/admin/broadcast_messages/index.html.haml
+1
-1
edit.html.haml
app/views/admin/groups/edit.html.haml
+1
-1
new.html.haml
app/views/admin/groups/new.html.haml
+1
-1
index.html.haml
app/views/admin/hooks/index.html.haml
+1
-1
_form.html.haml
app/views/admin/users/_form.html.haml
+2
-2
show.html.haml
app/views/admin/users/show.html.haml
+1
-1
edit.html.haml
app/views/groups/edit.html.haml
+1
-1
new.html.haml
app/views/groups/new.html.haml
+1
-1
_form.html.haml
app/views/profiles/keys/_form.html.haml
+1
-1
edit.html.haml
app/views/profiles/passwords/edit.html.haml
+1
-1
new.html.haml
app/views/profiles/passwords/new.html.haml
+1
-1
show.html.haml
app/views/profiles/show.html.haml
+1
-1
_errors.html.haml
app/views/projects/_errors.html.haml
+1
-1
huge_commit.html.haml
app/views/projects/commit/huge_commit.html.haml
+1
-1
_form.html.haml
app/views/projects/deploy_keys/_form.html.haml
+1
-1
fork.html.haml
app/views/projects/fork.html.haml
+1
-1
show.js.haml
app/views/projects/graphs/show.js.haml
+1
-1
index.html.haml
app/views/projects/hooks/index.html.haml
+1
-1
_form.html.haml
app/views/projects/issues/_form.html.haml
+1
-1
_form.html.haml
app/views/projects/merge_requests/_form.html.haml
+1
-1
invalid.html.haml
app/views/projects/merge_requests/invalid.html.haml
+1
-1
_mr_accept.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
+1
-1
_mr_box.html.haml
app/views/projects/merge_requests/show/_mr_box.html.haml
+1
-1
_mr_ci.html.haml
app/views/projects/merge_requests/show/_mr_ci.html.haml
+2
-2
_no_accept.html.haml
app/views/projects/merge_requests/show/_no_accept.html.haml
+1
-1
_form.html.haml
app/views/projects/milestones/_form.html.haml
+1
-1
index.html.haml
app/views/projects/protected_branches/index.html.haml
+1
-1
_form.html.haml
app/views/projects/services/_form.html.haml
+1
-1
_form.html.haml
app/views/projects/snippets/_form.html.haml
+1
-1
_form.html.haml
app/views/projects/team_members/_form.html.haml
+1
-1
_form.html.haml
app/views/snippets/_form.html.haml
+1
-1
No files found.
app/views/admin/broadcast_messages/index.html.haml
View file @
d7a48443
...
...
@@ -8,7 +8,7 @@
=
form_for
[
:admin
,
@broadcast_message
]
do
|
f
|
-
if
@broadcast_message
.
errors
.
any?
.alert.alert-
erro
r
.alert.alert-
dange
r
-
@broadcast_message
.
errors
.
full_messages
.
each
do
|
msg
|
%p
=
msg
.form-group
...
...
app/views/admin/groups/edit.html.haml
View file @
d7a48443
...
...
@@ -2,7 +2,7 @@
%hr
=
form_for
[
:admin
,
@group
]
do
|
f
|
-
if
@group
.
errors
.
any?
.alert.alert-
erro
r
.alert.alert-
dange
r
%span
=
@group
.
errors
.
full_messages
.
first
.form-group.group_name_holder
=
f
.
label
:name
do
...
...
app/views/admin/groups/new.html.haml
View file @
d7a48443
...
...
@@ -2,7 +2,7 @@
%hr
=
form_for
[
:admin
,
@group
]
do
|
f
|
-
if
@group
.
errors
.
any?
.alert.alert-
erro
r
.alert.alert-
dange
r
%span
=
@group
.
errors
.
full_messages
.
first
.form-group
=
f
.
label
:name
do
...
...
app/views/admin/hooks/index.html.haml
View file @
d7a48443
...
...
@@ -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-
erro
r
.alert.alert-
dange
r
-
@hook
.
errors
.
full_messages
.
each
do
|
msg
|
%p
=
msg
.form-group
...
...
app/views/admin/users/_form.html.haml
View file @
d7a48443
...
...
@@ -2,7 +2,7 @@
=
form_for
[
:admin
,
@user
]
do
|
f
|
-
if
@user
.
errors
.
any?
#error_explanation
%ul
.unstyled.alert.alert-
erro
r
%ul
.unstyled.alert.alert-
dange
r
-
@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-
erro
r
.alert.alert-
dange
r
-
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"
...
...
app/views/admin/users/show.html.haml
View file @
d7a48443
...
...
@@ -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-
erro
r
.alert.alert-
dange
r
%h4
Remove user
%br
...
...
app/views/groups/edit.html.haml
View file @
d7a48443
...
...
@@ -22,7 +22,7 @@
%div
.form-holder
=
form_for
@group
do
|
f
|
-
if
@group
.
errors
.
any?
.alert.alert-
erro
r
.alert.alert-
dange
r
%span
=
@group
.
errors
.
full_messages
.
first
.form-group
=
f
.
label
:name
do
...
...
app/views/groups/new.html.haml
View file @
d7a48443
=
form_for
@group
do
|
f
|
-
if
@group
.
errors
.
any?
.alert.alert-
erro
r
.alert.alert-
dange
r
%span
=
@group
.
errors
.
full_messages
.
first
.form-group
=
f
.
label
:name
do
...
...
app/views/profiles/keys/_form.html.haml
View file @
d7a48443
%div
=
form_for
[
:profile
,
@key
],
html:
{
class:
'form-horizontal'
}
do
|
f
|
-
if
@key
.
errors
.
any?
.alert.alert-
erro
r
.alert.alert-
dange
r
%ul
-
@key
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
...
...
app/views/profiles/passwords/edit.html.haml
View file @
d7a48443
...
...
@@ -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-
erro
r
.alert.alert-
dange
r
%ul
-
@user
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
...
...
app/views/profiles/passwords/new.html.haml
View file @
d7a48443
...
...
@@ -5,7 +5,7 @@
%br
After successful password update you will be redirected to login screen
-
if
@user
.
errors
.
any?
.alert.alert-
erro
r
.alert.alert-
dange
r
%ul
-
@user
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
...
...
app/views/profiles/show.html.haml
View file @
d7a48443
...
...
@@ -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-
erro
r
%div
.alert.alert-
dange
r
%ul
-
@user
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
...
...
app/views/projects/_errors.html.haml
View file @
d7a48443
-
if
@project
.
errors
.
any?
.alert.alert-
erro
r
.alert.alert-
dange
r
%button
{
type:
"button"
,
class:
"close"
,
"data-dismiss"
=>
"alert"
}
×
=
@project
.
errors
.
full_messages
.
first
app/views/projects/commit/huge_commit.html.haml
View file @
d7a48443
=
render
"projects/commit/commit_box"
.alert.alert-
erro
r
.alert.alert-
dange
r
%h4
Commit diffs are too big to be displayed
app/views/projects/deploy_keys/_form.html.haml
View file @
d7a48443
%div
=
form_for
[
@project
,
@key
],
url:
project_deploy_keys_path
do
|
f
|
-
if
@key
.
errors
.
any?
.alert.alert-
erro
r
.alert.alert-
dange
r
%ul
-
@key
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
...
...
app/views/projects/fork.html.haml
View file @
d7a48443
.alert.alert-
erro
r.alert-block
.alert.alert-
dange
r.alert-block
%h4
%i
.icon-code-fork
Fork Error!
...
...
app/views/projects/graphs/show.js.haml
View file @
d7a48443
...
...
@@ -16,4 +16,4 @@
})
-
else
:plain
$('.stat-graph').replaceWith('<div class="alert alert-
erro
r">Failed to load graph</div>')
$('.stat-graph').replaceWith('<div class="alert alert-
dange
r">Failed to load graph</div>')
app/views/projects/hooks/index.html.haml
View file @
d7a48443
...
...
@@ -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-
erro
r
.alert.alert-
dange
r
-
@hook
.
errors
.
full_messages
.
each
do
|
msg
|
%p
=
msg
.form-group
...
...
app/views/projects/issues/_form.html.haml
View file @
d7a48443
...
...
@@ -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-
erro
r
.alert.alert-
dange
r
-
@issue
.
errors
.
full_messages
.
each
do
|
msg
|
%span
=
msg
%br
...
...
app/views/projects/merge_requests/_form.html.haml
View file @
d7a48443
=
form_for
[
@project
,
@merge_request
],
html:
{
class:
"
#{
controller
.
action_name
}
-merge-request form-horizontal"
}
do
|
f
|
-
if
@merge_request
.
errors
.
any?
.alert.alert-
erro
r
.alert.alert-
dange
r
%ul
-
@merge_request
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
...
...
app/views/projects/merge_requests/invalid.html.haml
View file @
d7a48443
...
...
@@ -2,7 +2,7 @@
=
render
"projects/merge_requests/show/mr_title"
=
render
"projects/merge_requests/show/mr_box"
.alert.alert-
erro
r
.alert.alert-
dange
r
%p
We cannot render this merge request properly because
-
if
@merge_request
.
for_fork?
&&
!
@merge_request
.
source_project
...
...
app/views/projects/merge_requests/show/_mr_accept.html.haml
View file @
d7a48443
...
...
@@ -25,7 +25,7 @@
.automerge_widget.no_satellite
{
style:
"display:none"
}
.alert.alert-
erro
r
.alert.alert-
dange
r
%span
%strong
This repository does not have satellite. Ask an administrator to fix this issue
...
...
app/views/projects/merge_requests/show/_mr_box.html.haml
View file @
d7a48443
...
...
@@ -21,7 +21,7 @@
=
markdown
@merge_request
.
description
-
if
@merge_request
.
closed?
.description.alert-
erro
r
.description.alert-
dange
r
%span
%i
.icon-remove
Closed by
#{
link_to_member
(
@project
,
@merge_request
.
closed_event
.
author
)
}
...
...
app/views/projects/merge_requests/show/_mr_ci.html.haml
View file @
d7a48443
...
...
@@ -8,7 +8,7 @@
.ci_widget.ci-failed
{
style:
"display:none"
}
.alert.alert-
erro
r
.alert.alert-
dange
r
%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-
erro
r
.alert.alert-
dange
r
%i
.icon-remove
%strong
Cannot connect to CI server. Please check your setting
app/views/projects/merge_requests/show/_no_accept.html.haml
View file @
d7a48443
.alert.alert-
erro
r
.alert.alert-
dange
r
%p
This merge request can not be accepted because branch
-
unless
@merge_request
.
source_branch_exists?
...
...
app/views/projects/milestones/_form.html.haml
View file @
d7a48443
...
...
@@ -7,7 +7,7 @@
=
form_for
[
@project
,
@milestone
],
html:
{
class:
"new_milestone form-horizontal"
}
do
|
f
|
-
if
@milestone
.
errors
.
any?
.alert.alert-
erro
r
.alert.alert-
dange
r
%ul
-
@milestone
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
...
...
app/views/projects/protected_branches/index.html.haml
View file @
d7a48443
...
...
@@ -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-
erro
r
.alert.alert-
dange
r
%ul
-
@protected_branch
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
...
...
app/views/projects/services/_form.html.haml
View file @
d7a48443
...
...
@@ -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-
erro
r
.alert.alert-
dange
r
%ul
-
@service
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
...
...
app/views/projects/snippets/_form.html.haml
View file @
d7a48443
...
...
@@ -4,7 +4,7 @@
.snippet-form-holder
=
form_for
[
@project
,
@snippet
],
as: :project_snippet
,
url:
url
do
|
f
|
-
if
@snippet
.
errors
.
any?
.alert.alert-
erro
r
.alert.alert-
dange
r
%ul
-
@snippet
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
...
...
app/views/projects/team_members/_form.html.haml
View file @
d7a48443
...
...
@@ -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-
erro
r
.alert.alert-
dange
r
%ul
-
@user_project_relation
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
...
...
app/views/snippets/_form.html.haml
View file @
d7a48443
...
...
@@ -4,7 +4,7 @@
.snippet-form-holder
=
form_for
@snippet
,
as: :personal_snippet
,
url:
url
do
|
f
|
-
if
@snippet
.
errors
.
any?
.alert.alert-
erro
r
.alert.alert-
dange
r
%ul
-
@snippet
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment