delta/gitlab/gitlab-ce.git/app/models/concerns, branch rc-document-preferred-array-syntax

Merge branch 'issue_19734' into 'master'

2016-09-01T15:28:14+00:00


Project tools visibility level

## part of #19734   

![project_features_access_level](/uploads/81ec7185d4e61d7578652020209af925/project_features_access_level.png)

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

See merge request !5606

Project tools visibility level

2016-09-01T14:47:59+00:00

Merge branch '20601-emoji-tooltip-in-chronological-order' into 'master'

2016-09-01T14:10:46+00:00


Order award tooltips by their created_at date

## What are the relevant issue numbers?

Closes #20601

See merge request !6086

Order award tooltips by their created_at date

2016-08-31T22:40:10+00:00

Merge branch 'master' into prevent_authored_awardable_votes

2016-08-30T20:17:13+00:00

prevent authored awardable thumbs votes

2016-08-30T19:57:47+00:00

Merge branch 'shorten-task-status-phrase' into 'master'

2016-08-30T17:46:03+00:00


Shorten task status phrase

## What does this MR do?
Shortens the task status phrase to make it easier to read

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

## Why was this MR needed?
Improve readability/scan-ability of the issues table

## Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-27_at_12.38.17_PM](/uploads/12d54e4ce24dea203e8f7189b32e3a43/Screen_Shot_2016-08-27_at_12.38.17_PM.png)

After:
![Screen_Shot_2016-08-27_at_12.38.05_PM](/uploads/7dfcc3284025b889f6afa09ca273d928/Screen_Shot_2016-08-27_at_12.38.05_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)

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

See merge request !6062

Move #to_discussion to NoteOnDiff

2016-08-30T15:30:42+00:00

Shorten task status phrase

2016-08-29T15:46:36+00:00

prevent authored awardable thumbs votes

2016-08-28T17:15:55+00:00

prevent authored awardable thumbs votes

prevent authored awardable thumbs votes