delta/gitlab/gitlab-ce.git/spec/lib, branch fix/github-doc

Merge branch 'git-env-handle-arrays' into 'master'

2017-10-16T12:37:02+00:00

Add Gitlab::Git::Env.to_env_hash

See merge request gitlab-org/gitlab-ce!14841

Add Gitlab::Git::Env.to_env_hash

2017-10-16T11:19:44+00:00

Merge branch 'conflict-resolution-refactor' into 'master'

2017-10-16T10:36:06+00:00

Conflict resolution refactor

See merge request gitlab-org/gitlab-ce!14747

Merge branch 'fix_diff_parsing' into 'master'

2017-10-16T10:11:55+00:00

Fix diff parser so it tolerates to diff special markers in the content

Closes #34431

See merge request gitlab-org/gitlab-ce!14848

Popen with a timeout

2017-10-16T09:11:31+00:00

Merge branch 'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-count' into 'master'

2017-10-16T08:12:46+00:00

Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, instead of `Gcp::Cluster.count`

Closes #38960

See merge request gitlab-org/gitlab-ce!14807

Fix diff parser so it tolerates to diff special markers in the content

2017-10-15T14:00:36+00:00

Merge branch 'gitlab-ee-1312-time-spent-at' into 'master'

2017-10-13T15:52:41+00:00

added date parameter for time tracking

See merge request gitlab-org/gitlab-ce!14866

Merge Merge Requests via Gitaly

2017-10-13T12:07:31+00:00

Merge branch '39032-improve-merge-ongoing-check-consistency' into 'master'

2017-10-13T11:10:47+00:00

Make "merge ongoing" check more consistent

Closes #39032

See merge request gitlab-org/gitlab-ce!14825