delta/gitlab/gitlab-ce.git/lib, branch zj-include-openshift

Merge branch 'avoid-api-helper-call' into 'master'

2016-11-22T12:58:43+00:00


Avoid helper call with default parameters

The helpers can ultimately be removed when the issue API uses the Grape DSL.

See merge request !7649

Avoid helper call with default parameters

2016-11-22T10:26:29+00:00

Merge branch 'fix/ci-linter-undefined-error' into 'master'

2016-11-22T09:20:45+00:00


Fix undefined error in CI linter

## What does this MR do?

This MR fixes undefined error in CI linter.

## Does this MR meet the acceptance criteria?

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [x] Tests added for this feature/bug
  
## What are the relevant issue numbers?

Closes #24759

See merge request !7650

Fix entry lookup in CI config inheritance rules

2016-11-22T08:09:38+00:00

Merge branch '24730-broken-master' into 'master'

2016-11-22T05:54:24+00:00


Fix StrongAttibutes error with Ruby 2.1

Closes #24730

See merge request !7625

Merge branch 'improve-deploy-message' into 'master'

2016-11-21T21:53:39+00:00


Improve deploy message

## What does this MR do?
Improves deploy message to make it more descriptive and useable then what is already offered by deploy command.

## Does this MR meet the acceptance criteria?

- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

See merge request !7629

Merge branch 'dz-fix-500-group-git' into 'master'

2016-11-21T20:39:27+00:00


Fix 500 error when group name ends with git

Closes https://gitlab.com/gitlab-com/support-forum/issues/1298
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24742

See merge request !7630

Improve deploy command message

2016-11-21T20:36:22+00:00

Merge branch 'chatops-deploy-command' into 'master'

2016-11-21T20:27:58+00:00


Add deploy chat command

This adds a new ChatOps command:
```
/trigger deploy  to 
```

See merge request !7619

Merge branch 'feature/send-registry-address-with-build-payload' into 'master'

2016-11-21T20:22:55+00:00


Send registry address with build payload

## What does this MR do?

Adds `registry_url` as a part of a build payload, when sending a response to a GitLab Runner which requested a new build.

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

Change in `lib/ci/api/entities.rb`.

## Why was this MR needed?

This is one of the steps needed to add support for private/protected registries hosted with GitLab CE/EE.

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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)
- [ ] 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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

Related to gitlab-org/gitlab-ci-multi-runner#1828, gitlab-org/gitlab-ci-multi-runner!386, gitlab-org/gitlab-ci-multi-runner#1434

See merge request !7474