Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
423ffe29
Commit
423ffe29
authored
Jan 03, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix alerts
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
779355ae
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+1
-1
app/views/projects/merge_requests/show/_mr_accept.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
+1
-1
app/views/projects/merge_requests/show/_mr_ci.html.haml
app/views/projects/merge_requests/show/_mr_ci.html.haml
+2
-2
No files found.
app/views/projects/merge_requests/_show.html.haml
View file @
423ffe29
...
@@ -12,7 +12,7 @@
...
@@ -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
...
...
app/views/projects/merge_requests/show/_mr_accept.html.haml
View file @
423ffe29
...
@@ -37,7 +37,7 @@
...
@@ -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…
...
...
app/views/projects/merge_requests/show/_mr_ci.html.haml
View file @
423ffe29
...
@@ -16,14 +16,14 @@
...
@@ -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
}
...
...
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