delta/gitlab/gitlab-ce.git, branch doc/fix-koding-integration-link

Fix wrong Koding link

2016-08-25T15:56:03+00:00

Merge branch 'patch-5' into 'master'

2016-08-25T04:59:12+00:00


removed redundant word

## What does this MR do?

fixed a redundant `requests` in file merge_requests.md

See merge request !6007

removed redundant word

2016-08-25T04:56:48+00:00

Merge branch 'internal_recovery_api' into 'master'

2016-08-24T23:45:32+00:00


Add internal API to recovery 2FA

## What does this MR do?

Add an internal API to make SSH 2FA recovery possible. Related to gitlab-org/gitlab-shell!74

See merge request !5510

Add two factor recovery endpoint to internal API

2016-08-24T22:50:57+00:00

Merge branch 'add-sentry-logging-to-api' into 'master'

2016-08-24T22:42:02+00:00


Add Sentry logging to API calls

## What does this MR do?

This MR adds support for Sentry logging in the API.

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

Since the `Grape::Middleware` doesn't have a `params` method, I had to define one using the Rack Request.

## Why was this MR needed?

We are missing a lot of useful errors in the API causing git push/pull errors

## What are the relevant issue numbers?

#21043

See merge request !5882

Merge branch '20909-use-total-count-instead-of-size' into 'master'

2016-08-24T20:52:09+00:00


changes from using size to count and caching it to get the number of members in a group

- [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)
Closes #20909

See merge request !5935

Merge branch 'github-importer' into 'master'

2016-08-24T20:39:29+00:00


Does not halt the GitHub import process when an error occurs

## What are the relevant issue numbers?

Fixes #20385 

https://gitlab.com/gitlab-org/gitlab-ce/issues/20149

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

Merge branch 'restore-get_id' into 'master'

2016-08-24T20:34:36+00:00


Restore get_id in ExtractsPath

fixes #21334

`Addressable::URI.normalize_component()` around `get_id` which was introduced by 68cea38e94886e69099a3faa0d1e2fbde2e71899 and removed in !5878 is still intentionally omitted. Using `normalize_component()` instead of `unescape()` left `%` as is but still broke e.g. spaces (which were replaced by `%20`).

See merge request !5974

Merge branch 'workhorse-0.7.11' into 'master'

2016-08-24T19:28:23+00:00


Use gitlab-workhorse 0.7.11

Versions 0.7.9 and 0.7.10 crash on previously valid 'authBackend'
settings.

I don't know how many people are affected by this, 'normal' Omnibus
installations are not. (If they were gitlab.com would have stopped
working :) ). Still this is something we should not ship.
Unfortunately 8-11-stable uses 0.7.10 (but 8.11.0 does not). So I
think we need to put this in the next 8.11 patch release.

See merge request !5983