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
415921a7
Commit
415921a7
authored
Aug 05, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add avatar to commit message; environment style updates to match pipelines page
parent
ace19ec5
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
9 deletions
+25
-9
app/assets/stylesheets/pages/environments.scss
app/assets/stylesheets/pages/environments.scss
+13
-0
app/helpers/avatars_helper.rb
app/helpers/avatars_helper.rb
+0
-2
app/views/projects/deployments/_commit.html.haml
app/views/projects/deployments/_commit.html.haml
+6
-2
app/views/projects/environments/_environment.html.haml
app/views/projects/environments/_environment.html.haml
+4
-3
app/views/projects/environments/index.html.haml
app/views/projects/environments/index.html.haml
+2
-2
No files found.
app/assets/stylesheets/pages/environments.scss
View file @
415921a7
...
@@ -19,4 +19,17 @@
...
@@ -19,4 +19,17 @@
color
:
$table-text-gray
;
color
:
$table-text-gray
;
}
}
}
}
.branch-name
{
color
:
$gl-dark-link-color
;
}
}
.table.builds.environments
{
min-width
:
500px
;
.icon-container
{
width
:
20px
;
text-align
:
center
;
}
}
}
app/helpers/avatars_helper.rb
View file @
415921a7
...
@@ -8,8 +8,6 @@ module AvatarsHelper
...
@@ -8,8 +8,6 @@ module AvatarsHelper
}))
}))
end
end
private
def
user_avatar
(
options
=
{})
def
user_avatar
(
options
=
{})
avatar_size
=
options
[
:size
]
||
16
avatar_size
=
options
[
:size
]
||
16
user_name
=
options
[
:user
].
try
(
:name
)
||
options
[
:user_name
]
user_name
=
options
[
:user
].
try
(
:name
)
||
options
[
:user_name
]
...
...
app/views/projects/deployments/_commit.html.haml
View file @
415921a7
%div
.branch-commit
%div
.branch-commit
-
if
deployment
.
ref
-
if
deployment
.
ref
=
link_to
deployment
.
ref
,
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
deployment
.
ref
),
class:
"monospace"
.icon-container
·
=
deployment
.
tag?
?
icon
(
'tag'
)
:
icon
(
'code-fork'
)
=
link_to
deployment
.
ref
,
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
deployment
.
ref
),
class:
"monospace branch-name"
.icon-container
=
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"
%p
.commit-title
%p
.commit-title
%span
%span
-
if
commit_title
=
deployment
.
commit_title
-
if
commit_title
=
deployment
.
commit_title
=
user_avatar
(
user:
deployment
.
user
,
size:
20
)
=
link_to_gfm
commit_title
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
deployment
.
sha
),
class:
"commit-row-message"
=
link_to_gfm
commit_title
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
deployment
.
sha
),
class:
"commit-row-message"
-
else
-
else
Cant find HEAD commit for this branch
Cant find HEAD commit for this branch
app/views/projects/environments/_environment.html.haml
View file @
415921a7
...
@@ -2,8 +2,7 @@
...
@@ -2,8 +2,7 @@
%tr
.environment
%tr
.environment
%td
%td
%strong
=
link_to
environment
.
name
,
namespace_project_environment_path
(
@project
.
namespace
,
@project
,
environment
)
=
link_to
environment
.
name
,
namespace_project_environment_path
(
@project
.
namespace
,
@project
,
environment
)
%td
%td
-
if
last_deployment
-
if
last_deployment
...
@@ -14,7 +13,9 @@
...
@@ -14,7 +13,9 @@
%td
%td
-
if
last_deployment
-
if
last_deployment
#{
time_ago_with_tooltip
(
last_deployment
.
created_at
)
}
%p
.finished-at
=
icon
(
"calendar"
)
#{
time_ago_with_tooltip
(
last_deployment
.
created_at
,
short_format:
true
,
skip_js:
true
)
}
%td
%td
=
render
'projects/deployments/actions'
,
deployment:
last_deployment
=
render
'projects/deployments/actions'
,
deployment:
last_deployment
app/views/projects/environments/index.html.haml
View file @
415921a7
...
@@ -23,10 +23,10 @@
...
@@ -23,10 +23,10 @@
New environment
New environment
-
else
-
else
.table-holder
.table-holder
%table
.table.environments
%table
.table.
builds.
environments
%tbody
%tbody
%th
Environment
%th
Environment
%th
Last deployment
%th
Last deployment
%th
Date
%th
%th
%th
=
render
@environments
=
render
@environments
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