Add avatar to commit message; environment style updates to match pipelines page
This commit is contained in:
parent
ace19ec58f
commit
415921a7f3
|
@ -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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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]
|
||||||
|
|
|
@ -1,12 +1,16 @@
|
||||||
%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
|
||||||
|
|
|
@ -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 @@
|
||||||
|
|
||||||
%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
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue