delta/gitlab/gitlab-ce.git, branch 22152-improve-setup-ssh-documentation

Resolved MR discussions

2016-10-11T12:23:51+00:00

Merge branch 'master' into 22152-improve-setup-ssh-documentation

2016-10-11T12:05:54+00:00

Merge branch 'document-ci-shell-trace-variable' into 'master'

2016-10-11T11:52:15+00:00


Document the new CI_DEBUG_TRACE variable a feature that will
be introduced in GitLab Runner v1.7

Related to https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/339

See merge request !6700

Document the new CI_DEBUG_TRACE variable

2016-10-11T11:42:37+00:00

[ci skip]

Merge branch 'sh-fix-issue-20776' into 'master'

2016-10-11T11:41:02+00:00


Fix Error 500 when viewing old merge requests with bad diff data

Customers running old versions of GitLab may have MergeRequestDiffs with the text ["--broken diff"] due to text generated by gitlab_git 1.0.3.
To avoid the Error 500, verify that each element is a type that gitlab_git will accept before attempting to create a DiffCollection.
    
Closes #20776

See merge request !6754

Merge branch 'new-gitlab-users-clear_all_authentication_tokens-task' into 'master'

2016-10-11T11:40:35+00:00


Add a new gitlab:users:clear_all_authentication_tokens task

## What are the relevant issue numbers?

Part of #22537.

See merge request !6745

Merge branch 'master' into 'master'

2016-10-11T11:40:10+00:00


Update mail_room gem

## What does this MR do?

Upgrades the mail_room gem from 0.8.0 to 0.8.1.

## Why was this MR needed?

mail_room throws an exception if the watching script joins a undefined thread. Release 0.8.1 adds a check to ensure that the thread exists before calling join.

Fixes gitlab-org/omnibus-gitlab#1619.

See merge request !6714

Merge branch 'gitlab-basics' into 'master'

2016-10-11T11:38:30+00:00


Remove redundant images from GitLab basics docs



See merge request !6799

Merge branch 'nahtnam/gitlab-ce-ci-test-phoenix' into 'master'

2016-10-11T11:33:55+00:00


Add an example for testing a phoenix application with Gitlab CI

_Originally opened at !5074 by @nahtnam._

- - -

## What does this MR do?

Add an example on how to setup testing on phoenix 

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

Grammar and formatting

## Why was this MR needed?

https://twitter.com/gitlab/status/749898132008337408

## 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)
- Tests
  - [ ] All builds are passing
- [ ] 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 !6794

Merge branch 'gitlab-basics' into 'master'

2016-10-11T11:25:24+00:00


Replace images in GitLab basics docs



See merge request !6786