diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-10 08:46:28 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-10 09:44:05 -0500 |
| commit | 094828d01d2c146f2ba56af953333c2186ba9ba6 (patch) | |
| tree | bf8e15d187cd72a791b727b5a9fd5bb3bda54235 /app | |
| parent | b24c57d03d5d0e7665e708238450d957422ff711 (diff) | |
| download | gitlab-ce-094828d01d2c146f2ba56af953333c2186ba9ba6.tar.gz | |
Trigger updates
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 10 | ||||
| -rw-r--r-- | app/views/projects/ci/builds/_build.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/ci/pipelines/_pipeline.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/deployments/_commit.html.haml | 2 |
4 files changed, 12 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 8dc6707d85c..385ac07fdaf 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -26,6 +26,14 @@ .pipeline-id { color: $black; } + + .branch-commit { + width: 30%; + + .branch-name { + width: 195px + } + } } } @@ -86,7 +94,6 @@ } .branch-commit { - width: 30%; .branch-name { font-weight: bold; @@ -112,7 +119,6 @@ .commit-id { color: $gl-link-color; - margin-right: 8px; } .commit-title { diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index 9248adfde80..c9b0017b28b 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -27,7 +27,7 @@ = link_to build.ref, namespace_project_commits_path(build.project.namespace, build.project, build.ref), class: "monospace branch-name" - else .light none - .icon-container + .icon-container.commit-icon = custom_icon("icon_commit") - if commit_sha diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index 1bd7ee76f61..263a3ff61f7 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -14,8 +14,8 @@ = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do %span.pipeline-id ##{pipeline.id} %span by - - if commit = pipeline.commit - = author_avatar(commit, size: 20) + - if pipeline.user + = user_avatar(user: pipeline.user, size: 20) - if pipeline.latest? %span.label.label-success.has-tooltip{ title: 'Latest build for this branch' } latest - if pipeline.triggered? diff --git a/app/views/projects/deployments/_commit.html.haml b/app/views/projects/deployments/_commit.html.haml index 28813babd7b..ff250eeca50 100644 --- a/app/views/projects/deployments/_commit.html.haml +++ b/app/views/projects/deployments/_commit.html.haml @@ -3,7 +3,7 @@ .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 + .icon-container.commit-icon = custom_icon("icon_commit") = link_to deployment.short_sha, namespace_project_commit_path(@project.namespace, @project, deployment.sha), class: "commit-id monospace" |