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
Tatuya Kamada
gitlab-ce
Commits
c7afe1e5
Commit
c7afe1e5
authored
Oct 05, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds reference to the merge request in the commit column
parent
5e1c986b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
0 deletions
+12
-0
app/assets/stylesheets/pages/environments.scss
app/assets/stylesheets/pages/environments.scss
+6
-0
app/views/projects/deployments/_commit.html.haml
app/views/projects/deployments/_commit.html.haml
+6
-0
No files found.
app/assets/stylesheets/pages/environments.scss
View file @
c7afe1e5
...
@@ -39,4 +39,10 @@
...
@@ -39,4 +39,10 @@
width
:
20px
;
width
:
20px
;
text-align
:
center
;
text-align
:
center
;
}
}
.branch-commit
{
.commit-id
{
margin-right
:
0px
;
}
}
}
}
app/views/projects/deployments/_commit.html.haml
View file @
c7afe1e5
-
merge_request
=
deployment
.
deployable
.
try
(
:merge_request
)
%div
.branch-commit
%div
.branch-commit
-
if
deployment
.
ref
-
if
deployment
.
ref
.icon-container
.icon-container
...
@@ -6,6 +8,10 @@
...
@@ -6,6 +8,10 @@
.icon-container
.icon-container
=
custom_icon
(
"icon_commit"
)
=
custom_icon
(
"icon_commit"
)
=
link_to
deployment
.
short_sha
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
deployment
.
sha
),
class:
"commit-id monospace"
=
link_to
deployment
.
short_sha
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
deployment
.
sha
),
class:
"commit-id monospace"
-
if
merge_request
%span
in
=
link_to_gfm
merge_request
.
to_reference
,
merge_request_path
(
merge_request
)
%p
.commit-title
%p
.commit-title
%span
%span
...
...
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