delta/gitlab/gitlab-ce.git, branch fix/simplify-todo-destroy-queries

Rename TodoService#mark_todos_as_done_by_id{,s}

2016-08-17T19:54:34+00:00

Implement TodoService#mark_todos_as_done_by_id

2016-08-17T19:54:34+00:00

Follow-up on 52b0c26

Simplify SQL queries of marking a todo as done

2016-08-17T19:54:34+00:00

Merge branch 'add-delimiter-project-stats' into 'master'

2016-08-17T19:35:25+00:00


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

Merge branch '20808-merge-request-new-diff-view' into 'master'

2016-08-17T18:05:40+00:00


Fix merge request new view not changing code view rendering style

Correctly respects the code view changing when creating a merge request.

Closes #20808

See merge request !5768

Merge branch 'issue-boards' into 'master'

2016-08-17T18:02:26+00:00


Issue boards

## What are the relevant issue numbers?

- Issue: #17907 
- Issue backend: #20335 
- Backend MR: !5548
- Frontend MR: !5554
- Documentation !5713 

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [X] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [X] ~~API support added~~
- Tests
  - [x] Added for this feature/bug
  - [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)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5548

Merge branch 'fix-diff-comments-bug' into 'master'

2016-08-17T17:44:26+00:00


Fix diff comments inverted toggle bug

## What does this MR do?
Explicitly set the comments visibility toggle based on the `active` css class.

## Are there points in the code the reviewer needs to double check?
Shouldn't be

## Why was this MR needed?
Fixes existing UI bug

## What are the relevant issue numbers?
Closes #20898 

## Screenshots (if relevant)
Before:
![A1ccIDEWsI](/uploads/21175e2008ee4e00225c22afebd873aa/A1ccIDEWsI.gif)

After:
![jHoFp69mAK](/uploads/e85f429d60a4e56d588faec51cd8648a/jHoFp69mAK.gif)

## 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 !5818

Merge branch 'custom-events-tracking' into 'master'

2016-08-17T17:30:45+00:00


Tracking of custom events

## What does this MR do?

This MR adds the ability to track custom events such as the number of Git pushes.

## Are there points in the code the reviewer needs to double check?

The usual stuff.

## Why was this MR needed?

We want to track more business level data such as the number of Git pushes, how many repositories are imported (and from where), etc.

## What are the relevant issue numbers?

gitlab-org/gitlab-ce#13720

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] ~~API support added~~
- Tests
  - [x] Added for this feature/bug
  - [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)

cc @pcarranza 

See merge request !5830

Merge branch 'issue-boards-ui' into 'issue-boards'

2016-08-17T17:27:03+00:00


Issue boards UI

## What does this MR do?

UI for issue boards.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

## What are the relevant issue numbers?

-  Issue: #17907
-  Backend MR: !5548
-  Frontend MR: !5554
- Documentation !5713 

## Screenshots (if relevant)

![Screen_Shot_2016-08-17_at_14.06.06](/uploads/e2abed987d2c2d280e8b8034c8949024/Screen_Shot_2016-08-17_at_14.06.06.png)


See merge request !5554

Merge branch 'mc-ui'

2016-08-17T17:21:30+00:00

# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb