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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
9c4307e2
Commit
9c4307e2
authored
Sep 24, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show CI status on commit page
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
5faf3e81
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
0 deletions
+9
-0
app/controllers/projects/commit_controller.rb
app/controllers/projects/commit_controller.rb
+2
-0
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+7
-0
No files found.
app/controllers/projects/commit_controller.rb
View file @
9c4307e2
...
@@ -22,6 +22,8 @@ class Projects::CommitController < Projects::ApplicationController
...
@@ -22,6 +22,8 @@ class Projects::CommitController < Projects::ApplicationController
commit_id:
@commit
.
id
commit_id:
@commit
.
id
}
}
@ci_commit
=
project
.
ci_commit
(
commit
.
sha
)
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
format
.
html
format
.
diff
{
render
text:
@commit
.
to_diff
}
format
.
diff
{
render
text:
@commit
.
to_diff
}
...
...
app/views/projects/commit/_commit_box.html.haml
View file @
9c4307e2
...
@@ -38,6 +38,13 @@
...
@@ -38,6 +38,13 @@
-
@commit
.
parents
.
each
do
|
parent
|
-
@commit
.
parents
.
each
do
|
parent
|
=
link_to
parent
.
short_id
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
parent
)
=
link_to
parent
.
short_id
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
parent
)
-
if
@ci_commit
.pull-right
=
link_to
ci_status_path
(
@ci_commit
),
class:
"ci-status ci-
#{
@ci_commit
.
status
}
"
do
=
ci_status_icon
(
@ci_commit
)
build:
=
@ci_commit
.
status
.commit-info-row.branches
.commit-info-row.branches
%i
.fa.fa-spinner.fa-spin
%i
.fa.fa-spinner.fa-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