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
dc46dc1d
Commit
dc46dc1d
authored
Oct 21, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds commit back
parent
a60e6f14
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
app/controllers/projects/environments_controller.rb
app/controllers/projects/environments_controller.rb
+2
-3
app/views/projects/environments/components/_commit.html.haml
app/views/projects/environments/components/_commit.html.haml
+6
-1
No files found.
app/controllers/projects/environments_controller.rb
View file @
dc46dc1d
...
@@ -75,10 +75,9 @@ class Projects::EnvironmentsController < Projects::ApplicationController
...
@@ -75,10 +75,9 @@ class Projects::EnvironmentsController < Projects::ApplicationController
include:
{
include:
{
last_deployment:
{
last_deployment:
{
include:
{
include:
{
user:
{
only:
[
:id
,
:name
,
:username
],
methods:
[
:avatar_url
]
},
user:
{
only:
[
:id
,
:name
,
:username
],
methods:
[
:avatar_url
]
}
deployable:
{
only:
[
:id
,
:name
,
:ref
,
:tag
]
}
},
},
methods:
[
:short_sha
,
:commit_title
,
:commit
]
methods:
[
:short_sha
,
:commit_title
,
:
deployable
,
:
commit
]
}
}
}
}
)
)
...
...
app/views/projects/environments/components/_commit.html.haml
View file @
dc46dc1d
...
@@ -9,19 +9,24 @@
...
@@ -9,19 +9,24 @@
=
icon
(
"code-fork"
)
=
icon
(
"code-fork"
)
%a
.monospace.branch-name
{
":href"
=>
""
}
%a
.monospace.branch-name
{
":href"
=>
""
}
-# need commits branch name url
{{model.last_deployment.ref}}
{{model.last_deployment.ref}}
.icon-container.commit-icon
.icon-container.commit-icon
=
custom_icon
(
"icon_commit"
)
=
custom_icon
(
"icon_commit"
)
%a
.commit-id.monospace
{
":href"
=>
""
}
%a
.commit-id.monospace
{
":href"
=>
""
}
-# need commit url built with commit sha
{{model.last_deployment.short_sha}}
{{model.last_deployment.short_sha}}
{{model.last_deployment.sha}}
%p
.commit-title
%p
.commit-title
%span
{
"v-if"
=>
"model.last_deployment.commit_title"
}
%span
{
"v-if"
=>
"model.last_deployment.commit_title"
}
-# need commit author username and avatar_url
commit author goes here
%a
.commit-row-message
{
":href"
=>
""
}
%a
.commit-row-message
{
":href"
=>
""
}
-# need commit url built with commit sha
{{model.last_deployment.commit_title}}
{{model.last_deployment.commit_title}}
%span
{
"v-if"
=>
"!model.last_deployment.commit_title"
}
%span
{
"v-if"
=>
"!model.last_deployment.commit_title"
}
...
...
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