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
8d171f0a
Commit
8d171f0a
authored
Nov 07, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix commit column with correct data
parent
4388d903
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
20 deletions
+17
-20
app/views/projects/environments/components/_commit.html.haml
app/views/projects/environments/components/_commit.html.haml
+15
-18
app/views/projects/environments/index.html.haml
app/views/projects/environments/index.html.haml
+2
-2
No files found.
app/views/projects/environments/components/_commit.html.haml
View file @
8d171f0a
.branch-commit
{
"v-if"
=>
"!isFolder && model.last_deployment"
}
.branch-commit
{
"v-if"
=>
"!isFolder && model.last_deployment"
}
.icon-container
{
"v-if"
=>
"model.last_deployment.ref && model.last_deployment.tag"
}
=
icon
(
"tag"
)
%div
{
"v-if"
=>
"model.last_deployment.ref"
}
.icon-container
{
"v-if"
=>
"model.last_deployment.ref && !model.last_deployment.tag"
}
=
icon
(
"code-fork"
)
.icon-container
{
"v-if"
=>
"model.last_deployment.tag"
}
%a
.monospace.branch-name
{
"v-if"
=>
"model.last_deployment.ref"
,
":href"
=>
"model.last_deployment.ref.ref_url"
}
=
icon
(
"tag"
)
{{model.last_deployment.ref.name}}
.icon-container
{
"v-if"
=>
"!model.last_deployment.tag"
}
=
icon
(
"code-fork"
)
%a
.monospace.branch-name
{
":href"
=>
"'/' + model.project.namespace.name + '/' + model.project.name + '/commits/' +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"
=>
"
'/' + model.project.namespace.name + '/' + model.project.name + '/commit/' +model.last_deployment.sha
"
}
%a
.commit-id.monospace
{
":href"
=>
"
model.last_deployment.commit.commit_url
"
}
{{model.last_deployment.
short_sha
}}
{{model.last_deployment.
commit.short_id
}}
%p
.commit-title
%p
.commit-title
%span
{
"v-if"
=>
"model.last_deployment.commit
_
title"
}
%span
{
"v-if"
=>
"model.last_deployment.commit
&& model.last_deployment.commit.
title"
}
%a
{
"v-if"
=>
"model.last_deployment.commit.author"
,
":href"
=>
"model.last_deployment.commit.author.web_url"
}
-# need commit author username and avatar_url
%img
.avatar.has-tooltip.s20
{
":title"
=>
"model.last_deployment.commit.author.username"
,
commit author goes here
":src"
=>
"model.last_deployment.commit.author.avatar_url"
}
%a
.commit-row-message
{
":href"
=>
"
'/' + model.project.namespace.name + '/' + model.project.name + '/commit/' +model.last_deployment.sha
"
}
%a
.commit-row-message
{
":href"
=>
"
model.last_deployment.commit.commit_url
"
}
{{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"
}
Cant find HEAD commit for this branch
Cant find HEAD commit for this branch
app/views/projects/environments/index.html.haml
View file @
8d171f0a
...
@@ -20,8 +20,8 @@
...
@@ -20,8 +20,8 @@
%span
.badge.js-stopped-environments-count
%span
.badge.js-stopped-environments-count
{{state.stoppedCounter}}
{{state.stoppedCounter}}
-
if
can?
(
current_user
,
:create_environment
,
@project
)
&&
!
@all_environments
.
blank?
-
if
can?
(
current_user
,
:create_environment
,
@project
)
.nav-controls
.nav-controls
{
"v-if"
=>
"!loading"
}
=
link_to
new_namespace_project_environment_path
(
@project
.
namespace
,
@project
),
class:
"btn btn-create"
do
=
link_to
new_namespace_project_environment_path
(
@project
.
namespace
,
@project
),
class:
"btn btn-create"
do
New environment
New environment
...
...
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