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 😃 ## 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

Merge branch 'add-delimiter-project-stats' into 'master'
146e9059 · Jacob Schatz · a6a45628 · 84ee2857 · 146e9059 · 146e9059
Commit 146e9059 authored Aug 17, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

CHANGELOG CHANGELOG +1 -0

_project.html.haml app/views/shared/projects/_project.html.haml +2 -2

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ v 8.11.0 (unreleased)
  - Remove the http_parser.rb dependency by removing the tinder gem. !5758 (tbalthazar)
  - Ability to specify branches for Pivotal Tracker integration (Egor Lynko)
  - Fix don't pass a local variable called `i` to a partial. !20510 (herminiotorres)
+  - Add delimiter to project stars and forks count (ClemMakesApps)
  - Fix rename `add_users_into_project` and `projects_ids`. !20512 (herminiotorres)
  - Fix the title of the toggle dropdown button. !5515 (herminiotorres)
  - Rename `markdown_preview` routes to `preview_markdown`. (Christopher Bartz)

--- 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)