diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2016-10-05 11:40:44 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2016-10-05 11:40:44 +0100 |
| commit | 2f01392d227810160ab037231c00da01a9efe62d (patch) | |
| tree | 581cdb14202a75a4e1e8e06becc83f9e339100e8 | |
| parent | b189a34bf3ee9eb631ff6c56154638215725fbc7 (diff) | |
| download | gitlab-ce-2f01392d227810160ab037231c00da01a9efe62d.tar.gz | |
Updates Last Deployment column in environmnets list according to design
| -rw-r--r-- | app/assets/stylesheets/pages/environments.scss | 5 | ||||
| -rw-r--r-- | app/views/projects/environments/_environment.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/environments/index.html.haml | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss index d01c60ee6ab..51bf0982e6c 100644 --- a/app/assets/stylesheets/pages/environments.scss +++ b/app/assets/stylesheets/pages/environments.scss @@ -1,4 +1,9 @@ .environments { + .deployment-column { + .avatar { + float: none; + } + } .commit-title { margin: 0; diff --git a/app/views/projects/environments/_environment.html.haml b/app/views/projects/environments/_environment.html.haml index 73a88dc38ba..915e7fa4514 100644 --- a/app/views/projects/environments/_environment.html.haml +++ b/app/views/projects/environments/_environment.html.haml @@ -4,10 +4,10 @@ %td = link_to environment.name, namespace_project_environment_path(@project.namespace, @project, environment) - %td + %td.deployment-column - if last_deployment + %span ##{last_deployment.iid} by = user_avatar(user: last_deployment.user, size: 20) - %span ##{last_deployment.iid} %td - if last_deployment diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml index 8da9221e08a..b3eb5b0011a 100644 --- a/app/views/projects/environments/index.html.haml +++ b/app/views/projects/environments/index.html.haml @@ -26,7 +26,7 @@ %table.table.builds.environments %tbody %th Environment - %th Last Deployment ID + %th Last Deployment %th Commit %th %th |