diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-06 22:38:39 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2017-06-06 22:38:39 +0000 |
commit | 67830322b98eb5353101ce3724fe7ab9fe17a8a5 (patch) | |
tree | 6547c893f6d913480971f9dfdd8f9236d0588ffb /app/views/projects/deployments | |
parent | 71f9c43c833531fb6e2231225b74a42dea4ae00c (diff) | |
download | gitlab-ce-67830322b98eb5353101ce3724fe7ab9fe17a8a5.tar.gz |
Environment detail view
Diffstat (limited to 'app/views/projects/deployments')
-rw-r--r-- | app/views/projects/deployments/_actions.haml | 2 | ||||
-rw-r--r-- | app/views/projects/deployments/_commit.html.haml | 6 | ||||
-rw-r--r-- | app/views/projects/deployments/_deployment.html.haml | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/app/views/projects/deployments/_actions.haml b/app/views/projects/deployments/_actions.haml index e2baaa625ae..c96616a0be4 100644 --- a/app/views/projects/deployments/_actions.haml +++ b/app/views/projects/deployments/_actions.haml @@ -6,7 +6,7 @@ %button.dropdown.dropdown-new.btn.btn-default{ type: 'button', 'data-toggle' => 'dropdown' } = custom_icon('icon_play') = icon('caret-down') - %ul.dropdown-menu.dropdown-menu-align-right + %ul.dropdown-menu - actions.each do |action| - next unless can?(current_user, :update_build, action) %li diff --git a/app/views/projects/deployments/_commit.html.haml b/app/views/projects/deployments/_commit.html.haml index 31fd982c522..465ddaf713a 100644 --- a/app/views/projects/deployments/_commit.html.haml +++ b/app/views/projects/deployments/_commit.html.haml @@ -1,14 +1,14 @@ .branch-commit - if deployment.ref - .icon-container + %span.icon-container = deployment.tag? ? icon('tag') : icon('code-fork') = link_to deployment.ref, project_ref_path(@project, deployment.ref), class: "ref-name" .icon-container.commit-icon = custom_icon("icon_commit") = link_to deployment.short_sha, namespace_project_commit_path(@project.namespace, @project, deployment.sha), class: "commit-sha" - %p.commit-title - %span + %p.commit-title.flex-truncate-parent + %span.flex-truncate-child - if commit_title = deployment.commit_title = author_avatar(deployment.commit, size: 20) = link_to_gfm commit_title, namespace_project_commit_path(@project.namespace, @project, deployment.sha), class: "commit-row-message" diff --git a/app/views/projects/deployments/_deployment.html.haml b/app/views/projects/deployments/_deployment.html.haml index 260c9023daf..d6822106266 100644 --- a/app/views/projects/deployments/_deployment.html.haml +++ b/app/views/projects/deployments/_deployment.html.haml @@ -1,11 +1,11 @@ -%tr.deployment - %td +.gl-responsive-table-row.deployment + .table-section.section-10{ role: 'gridcell' } %strong ##{deployment.iid} - %td + .table-section.section-40{ role: 'gridcell' } = render 'projects/deployments/commit', deployment: deployment - %td.build-column + .table-section.section-15.build-column{ role: 'gridcell' } - if deployment.deployable = link_to [@project.namespace.becomes(Namespace), @project, deployment.deployable], class: 'build-link' do #{deployment.deployable.name} (##{deployment.deployable.id}) @@ -13,10 +13,10 @@ by = user_avatar(user: deployment.user, size: 20) - %td + .table-section.section-15{ role: 'gridcell' } #{time_ago_with_tooltip(deployment.created_at)} - %td.hidden-xs - .pull-right.btn-group + .table-section.section-20.environments-actions.table-button-footer{ role: 'gridcell' } + .btn-group.environment-action-buttons = render 'projects/deployments/actions', deployment: deployment = render 'projects/deployments/rollback', deployment: deployment |