delta/gitlab/gitlab-ce.git/lib, branch fix-ruby-2-1-failures

Don't use Hash#slice since it's not supported in Ruby 2.1

2016-10-20T17:08:46+00:00

Signed-off-by: Rémy Coutable

Merge remote-tracking branch 'upstream/master' into preserve-note_type-and-position

2016-10-20T12:47:44+00:00

* upstream/master:
  Restrict ProjectCacheWorker jobs to one per 15 min
  Removed code from project members controller
  Make label API spec independent of order
  Refactoring find_commits functionality
  Differentiate the expire from leave event
  Remove pagination description from individual doc
  Fix a broken table in Project API doc
  Create project feature when project is created
  Simpler arguments passed to named_route on toggle_award_url helper method
  Fixed height of issue board blank state

Merge branch 'refactoring_find_commits_method' into 'master'

2016-10-20T10:43:33+00:00


Refactoring find_commits method

It's possible that `find_commits_by_message` return nil in array which is not OK. We have different checks outside of this method. This MR places all checks inside the method.

See merge request !7000

Refactoring find_commits functionality

2016-10-20T09:45:34+00:00

Preserve note_type and position for notes from emails

2016-10-20T08:18:53+00:00

Closes #23208

Differentiate the expire from leave event

2016-10-20T00:26:45+00:00

At the moment we cannot see weather a user left a project due to their
membership expiring of if they themselves opted to leave the project.
This adds a new event type that allows us to make this differentiation.
Note that is not really feasable to go back and reliably fix up the
previous events. As a result the events for previous expire removals
will remain the same however events of this nature going forward will be
correctly represented.

Merge branch 'feature/group-level-labels' into 'master'

2016-10-19T20:41:04+00:00


Add group level labels

## What does this MR do?

Add group level labels.

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

* `LabelsFinder`
* `Gitlab::Gfm::ReferenceRewriter`
* `Banzai::Filter::LabelReferenceFilter`

## Why was this MR needed?

We'll be adding more feature that allow you to do cross-project management of issues.

## Screenshots (if relevant)

* Group Labels
    ![Group Labels](/uploads/2244c06ad68eae4fb246fb4c81bf8060/2.png)

* Project Labels
    ![Project Labels](/uploads/c5839516d2282b51f7418d9dadbeceb4/1.png)

* Expanded references for group labels when moving issue to another project
    ![Expanded references for group labels when moving issue to another project](/uploads/0c9ab248a8420d4978d59349ae3d42e5/3.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [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
  - [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] 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 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?

#19997

See merge request !6425

Use LabelsFinder on Fogbuz importer

2016-10-19T19:28:14+00:00

Use LabelsFinder on Google Code importer

2016-10-19T19:27:58+00:00

Merge branch 'issue_828' into 'master'

2016-10-19T19:01:55+00:00


Prevent wrong markdown on issue ids when project has Jira service activated

fixes gitlab-org/gitlab-ee#828

See merge request !6728