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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
c767d0e6
Commit
c767d0e6
authored
Dec 08, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change text of MR widget heading
parent
1567572e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
5 deletions
+14
-5
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+4
-0
app/views/projects/merge_requests/widget/_heading.html.haml
app/views/projects/merge_requests/widget/_heading.html.haml
+10
-5
No files found.
app/assets/stylesheets/pages/merge_requests.scss
View file @
c767d0e6
...
@@ -81,6 +81,10 @@
...
@@ -81,6 +81,10 @@
&
.ci-error
{
&
.ci-error
{
color
:
$gl-danger
;
color
:
$gl-danger
;
}
}
a
.monospace
{
color
:
inherit
;
}
}
}
.mr-widget-body
,
.mr-widget-body
,
...
...
app/views/projects/merge_requests/widget/_heading.html.haml
View file @
c767d0e6
...
@@ -4,10 +4,12 @@
...
@@ -4,10 +4,12 @@
.mr-widget-heading
.mr-widget-heading
.ci_widget
{
class:
"ci-#{status}"
}
.ci_widget
{
class:
"ci-#{status}"
}
=
ci_status_icon
(
ci_commit
)
=
ci_status_icon
(
ci_commit
)
%span
CI build
#{
status
}
%span
Build
#{
status
}
for
#{
@merge_request
.
last_commit_short_sha
}
.
for
=
succeed
"."
do
=
link_to
@ci_commit
.
short_sha
,
namespace_project_commit_path
(
@merge_request
.
source_project
.
namespace
,
@merge_request
.
source_project
,
@ci_commit
.
sha
),
class:
"monospace"
%span
.ci-coverage
%span
.ci-coverage
=
link_to
"View
build
details"
,
builds_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
class:
"js-show-tab"
,
data:
{
action:
'builds'
}
=
link_to
"View details"
,
builds_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
class:
"js-show-tab"
,
data:
{
action:
'builds'
}
-
elsif
@merge_request
.
has_ci?
-
elsif
@merge_request
.
has_ci?
-
# Compatibility with old CI integrations (ex jenkins) when you request status from CI server via AJAX
-
# Compatibility with old CI integrations (ex jenkins) when you request status from CI server via AJAX
...
@@ -21,10 +23,13 @@
...
@@ -21,10 +23,13 @@
-
else
-
else
=
icon
(
"circle"
)
=
icon
(
"circle"
)
%span
CI build
#{
status
}
%span
CI build
#{
status
}
for
#{
@merge_request
.
last_commit_short_sha
}
.
for
-
commit
=
@merge_request
.
last_commit
=
succeed
"."
do
=
link_to
commit
.
short_id
,
namespace_project_commit_path
(
@merge_request
.
source_project
.
namespace
,
@merge_request
.
source_project
,
commit
),
class:
"monospace"
%span
.ci-coverage
%span
.ci-coverage
-
if
ci_build_details_path
(
@merge_request
)
-
if
ci_build_details_path
(
@merge_request
)
=
link_to
"View
build
details"
,
ci_build_details_path
(
@merge_request
),
:"data-no-turbolink"
=>
"data-no-turbolink"
=
link_to
"View details"
,
ci_build_details_path
(
@merge_request
),
:"data-no-turbolink"
=>
"data-no-turbolink"
.ci_widget
.ci_widget
=
icon
(
"spinner spin"
)
=
icon
(
"spinner spin"
)
...
...
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