delta/gitlab/gitlab-ce.git, branch fix/improve-concurrent-pipeline-processing

Schedule pipeline worker only when it is unique

2016-10-21T07:44:35+00:00

Add unique pipeline processing rules to workers

2016-10-21T06:43:36+00:00

Add mixin for unique sidekiq workers using lease

2016-10-21T06:21:47+00:00

Merge branch '3212-trim-white-space-at-start-and-end-when-creating-new-project' into 'master'

2016-10-20T23:54:06+00:00


Trim project_path whitespace on form submit

## What does this MR do?

Trim leading/trailing whitespace on project_path input when focus leaves.

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

If tests are deemed necessary?

## Why was this MR needed?

To handle a reported bug #3212.

## Screenshots (if relevant)

## 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)
- [ ] API support added
- Tests
  - [ ] 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)
- [ ] 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 #3212

See merge request !6710

Trim project_path whitespace on form submit

2016-10-20T21:38:20+00:00

When the form is submitted, any leading and/or trailing whitespace is trimmed.

Merge branch 'fix-ruby-2-1-failures' into 'master'

2016-10-20T18:47:27+00:00


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

There is currently a build failure in `master` and this MR fixes it. The issue was introduced by !6879.

The problem is that `Hash#slice` doesn't exists in Ruby 2.1. I've created an issue to take care of the other places we're using `Hash#slice`: #23590

See merge request !7025

Merge branch 'fix/validate-board-limit' into 'master'

2016-10-20T18:42:51+00:00


[ci skip] Add a comment explaining validate_board_limit callback

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ee/issues/929

See merge request !7023

Merge branch 'pass-namespace-gitlab-project-import' into 'master'

2016-10-20T18:00:19+00:00


Fix GitLab project import when a user has access only to their default namespace

## What does this MR do?

It fixes a bug when a namespace ID was not passed to `/import/gitlab_project/new` page. It occurred when a user have no choice of the namespace, so we did not render the input for namespace ID. This MR introduces a hidden input for the described case.

## Does this MR meet the acceptance criteria?

- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] 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)
- [x] Branch has no merge conflicts with `master` (if it does - 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?

Fixes #23507

See merge request !6995

Merge branch 'protected-branches-bundle' into 'master'

2016-10-20T17:55:54+00:00


Create protected branches bundle

Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/645

See merge request !6909

Merge branch 'zj-use-iid-deployment-refs' into 'master'

2016-10-20T17:55:38+00:00


Use iid deployment refs

This fixes the 404, because `find_by` will return nil instead of throwing an error.

See merge request !7021