diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-08-17 22:35:25 +0300 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-08-17 22:35:25 +0300 |
commit | 146e905995fad9753fe4e4afa72342532acb90b0 (patch) | |
tree | 71d945f11a0fb4f4df9d78a64ce8513f93c50bee /app/views/shared/projects | |
parent | a6a4562872017e2e00d0f8172b0580dd54468e05 (diff) | |
parent | 84ee2857975ed2da991604d9f93a151b66032991 (diff) |
Merge branch 'add-delimiter-project-stats' into 'master'
Add delimiter to project stars and forks count
## What does this MR do?
Adds the `number_with_delimiter()`to the project stars and fork counts on the projects dashboard.
## Are there points in the code the reviewer needs to double check?
Shouldn't be any :smiley:
## Why was this MR needed?
Improve readability and adhere to the [UI guide](https://gitlab.com/help/development/ui_guide.md#counts)
## What are the relevant issue numbers?
Closes #20746
## Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-09_at_1.30.44_PM](/uploads/69592ce220d64774e265cfbcfcb6864a/Screen_Shot_2016-08-09_at_1.30.44_PM.png)
After:
![Screen_Shot_2016-08-09_at_1.30.58_PM](/uploads/1470179256614c2e47cc9d0e49aeaf09/Screen_Shot_2016-08-09_at_1.30.58_PM.png)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5741
Diffstat (limited to 'app/views/shared/projects')
-rw-r--r-- | app/views/shared/projects/_project.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml index 281ec728e41..66c309644a7 100644 --- a/app/views/shared/projects/_project.html.haml +++ b/app/views/shared/projects/_project.html.haml @@ -20,11 +20,11 @@ - if forks %span = icon('code-fork') - = project.forks_count + = number_with_delimiter(project.forks_count) - if stars %span = icon('star') - = project.star_count + = number_with_delimiter(project.star_count) %span.visibility-icon.has-tooltip{data: { container: 'body', placement: 'left' }, title: visibility_icon_description(project)} = visibility_level_icon(project.visibility_level, fw: true) |