delta/gitlab/gitlab-ce.git/doc, branch better-parallel-diff

Merge branch 'api-docs-typos' into 'master'

2016-07-09T15:15:20+00:00


Fix typos in API documentation

See merge request !4949

Merge branch 'patch-3' into 'master'

2016-07-09T15:07:57+00:00


Fix phpunit command in the docker example.

Closes https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1478

See merge request !5147

Merge branch 'patch-3' into 'master'

2016-07-09T15:01:05+00:00


Fix wrong gitlab-shell version in 8.9-8.10 update guide

See merge request !5153

Merge branch 'doc-custom-hooks' into 'master'

2016-07-09T14:26:07+00:00


Fix typo and explain the precedence of STDERR and STDOUT

## What does this MR do?

Addresses comments https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5088#note_12884564

See merge request !5169

Fix typo and explain the precedence of STDERR and STDOUT

2016-07-09T13:54:46+00:00

Update ui_guide.md with button capitalize rule

2016-07-08T21:20:13+00:00

Merge branch 'edgemaster/gitlab-ce-patch-missing-api-docs'

2016-07-08T15:52:53+00:00

See !4096.

Signed-off-by: Rémy Coutable

Merge branch 'clarify-github-integration-docs' into 'master'

2016-07-08T15:50:02+00:00


Fix documentation for Github integration authorization callback url.

There are two callbacks that could be used with Github integration:

  * /import/github/callback (used by project import)
  * /users/auth/github/callback (used by OmniAuth)

Github's documentation suggests that authorization callback url should be
set to the longest common path.

https://developer.github.com/v3/oauth/#redirect-urls

Configuring according to the previous documentation resulted in a
redirect_uri_mismatch error from Github when logging in via OmniAuth.

See merge request !4111

Merge branch 'patch-1' into 'master'

2016-07-08T14:52:37+00:00


Fixed Typo in README.md

## What does this MR do?
Found a Typo in the README.md file.  before_script should be with ":"  Script didn't work for me without ":"

## Why was this MR needed?
Missing ":" can be irritating for new users.

See merge request !4419

Merge branch 'api-shared-projects' into 'master'

2016-07-08T14:30:35+00:00


Api shared projects

## What does this MR do?

Exposes the shared projects in the group endpoint

## What are the relevant issue numbers?

Builds upon !5148 and closes #18780

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