Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-11-04 14:00:52 +0300
committerFatih Acet <acetfatih@gmail.com>2016-11-04 14:00:52 +0300
commit66bcf875206629c78905f276b6e8d79817a87acf (patch)
tree5ad7285180721b11505ac225038b5ca7bc54f17c /app/views/projects/branches/_commit.html.haml
parenta30d34b2e70a65d670517ab3869d8e925d6c8fc1 (diff)
parent7f6607e36f6108a78b361fc0113a3ff2e820650d (diff)
Merge branch '24022-update-styling-commit-sha-in-branches-list' into 'master'
Updated styling commit SHA on branches page ## What does this MR do? Updated styling of commit SHA on the branches page to include the commit icon and be blue ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? to make the branches page in line with upcoming update to the commit list, which also styles the commit sha, but slightly different. ## Screenshots (if relevant) before: ![image](/uploads/ce6eae30d0a07be2d76881d3c5e04e7d/image.png) after: ![image](/uploads/a10df4fe6efbb168fc9b51ae87f53da7/image.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24022 See merge request !7219
Diffstat (limited to 'app/views/projects/branches/_commit.html.haml')
-rw-r--r--app/views/projects/branches/_commit.html.haml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/projects/branches/_commit.html.haml b/app/views/projects/branches/_commit.html.haml
index d54c76ff9c8..de607772df6 100644
--- a/app/views/projects/branches/_commit.html.haml
+++ b/app/views/projects/branches/_commit.html.haml
@@ -1,4 +1,6 @@
.branch-commit
+ .icon-container.commit-icon
+ = custom_icon("icon_commit")
= link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit.id), class: "commit-id monospace"
&middot;
%span.str-truncated