diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-06-26 20:26:42 +0300 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-06-27 22:16:10 +0300 |
| commit | f979ad63a64d0c1d5bc8210fd88969f0a9cf01bf (patch) | |
| tree | 69fc7e19903e722681a0674efb0d2e6e9f8de127 /app | |
| parent | eb0d4e2615718d5dfe1ec332b5b7ccdd88693fd1 (diff) | |
Merge branch '34320-environment-detail-job' into 'master'
Truncate long job names in environment view; wrap author to next line
Closes #34320
See merge request !12455
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/deployments/_deployment.html.haml | 11 | ||||
| -rw-r--r-- | app/views/projects/environments/show.html.haml | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/app/views/projects/deployments/_deployment.html.haml b/app/views/projects/deployments/_deployment.html.haml index b3052bf7c35..e470c3c44ff 100644 --- a/app/views/projects/deployments/_deployment.html.haml +++ b/app/views/projects/deployments/_deployment.html.haml @@ -11,11 +11,14 @@ .table-mobile-header{ role: 'rowheader' } Job - if deployment.deployable .table-mobile-content - = link_to [@project.namespace.becomes(Namespace), @project, deployment.deployable], class: 'build-link' do - #{deployment.deployable.name} (##{deployment.deployable.id}) + .flex-truncate-parent + .flex-truncate-child + = link_to [@project.namespace.becomes(Namespace), @project, deployment.deployable], class: 'build-link' do + #{deployment.deployable.name} (##{deployment.deployable.id}) - if deployment.user - by - = user_avatar(user: deployment.user, size: 20) + %div + by + = user_avatar(user: deployment.user, size: 20) .table-section.section-15{ role: 'gridcell' } .table-mobile-header{ role: 'rowheader' } Created diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml index 23aa4c29e69..31e2bb11ce8 100644 --- a/app/views/projects/environments/show.html.haml +++ b/app/views/projects/environments/show.html.haml @@ -31,8 +31,8 @@ .ci-table.environments{ role: 'grid' } .gl-responsive-table-row.table-row-header{ role: 'row' } .table-section.section-10{ role: 'columnheader' } ID - .table-section.section-40{ role: 'columnheader' } Commit - .table-section.section-15{ role: 'columnheader' } Job + .table-section.section-30{ role: 'columnheader' } Commit + .table-section.section-25{ role: 'columnheader' } Job .table-section.section-15{ role: 'columnheader' } Created = render @deployments |