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
78fba275
Commit
78fba275
authored
Aug 09, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More textual tweaks
parent
7b780237
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
app/views/projects/merge_requests/widget/_heading.html.haml
app/views/projects/merge_requests/widget/_heading.html.haml
+4
-3
app/views/projects/merge_requests/widget/_locked.html.haml
app/views/projects/merge_requests/widget/_locked.html.haml
+1
-1
app/views/projects/merge_requests/widget/open/_check.html.haml
...iews/projects/merge_requests/widget/open/_check.html.haml
+1
-1
No files found.
app/views/projects/merge_requests/widget/_heading.html.haml
View file @
78fba275
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
-
[
:success
,
:skipped
,
:canceled
,
:failed
,
:running
,
:pending
].
each
do
|
status
|
-
[
:success
,
:skipped
,
:canceled
,
:failed
,
:running
,
:pending
].
each
do
|
status
|
.ci_widget
{
class:
"ci-#{status}"
,
style:
"display:none"
}
.ci_widget
{
class:
"ci-#{status}"
,
style:
"display:none"
}
-
if
status
==
:success
-
if
status
==
:success
-
status
=
"passed"
=
icon
(
"check-circle"
)
=
icon
(
"check-circle"
)
-
else
-
else
=
icon
(
"circle"
)
=
icon
(
"circle"
)
...
@@ -13,15 +14,15 @@
...
@@ -13,15 +14,15 @@
.ci_widget
.ci_widget
=
icon
(
"spinner spin"
)
=
icon
(
"spinner spin"
)
Checking CI status for
#{
@merge_request
.
last_commit_short_sha
}
Checking CI status for
#{
@merge_request
.
last_commit_short_sha
}
…
.ci_widget.ci-not_found
{
style:
"display:none"
}
.ci_widget.ci-not_found
{
style:
"display:none"
}
=
icon
(
"times-circle"
)
=
icon
(
"times-circle"
)
%span
Cannot find status on the CI server
for
#{
@merge_request
.
last_commit_short_sha
}
.
Could not find CI status
for
#{
@merge_request
.
last_commit_short_sha
}
.
.ci_widget.ci-error
{
style:
"display:none"
}
.ci_widget.ci-error
{
style:
"display:none"
}
=
icon
(
"times-circle"
)
=
icon
(
"times-circle"
)
%span
Can
not connect to the CI server. Please check your settings and try again.
Could
not connect to the CI server. Please check your settings and try again.
:coffeescript
:coffeescript
$ ->
$ ->
...
...
app/views/projects/merge_requests/widget/_locked.html.haml
View file @
78fba275
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
.mr-widget-body
.mr-widget-body
%h4
%h4
=
icon
(
"spinner spin"
)
=
icon
(
"spinner spin"
)
Merge in progress
...
Merge in progress
…
%p
%p
This merge request is in the process of being merged, during which time it is locked and cannot be closed.
This merge request is in the process of being merged, during which time it is locked and cannot be closed.
app/views/projects/merge_requests/widget/open/_check.html.haml
View file @
78fba275
%strong
%strong
=
icon
(
"spinner spin"
)
=
icon
(
"spinner spin"
)
Checking ability to merge automatically
...
Checking ability to merge automatically
…
:coffeescript
:coffeescript
$ ->
$ ->
...
...
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