delta/gitlab/gitlab-ce.git/spec, branch fix/github-doc gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'sha-handling' into 'master' 2017-10-16T15:14:42+00:00 Douwe Maan douwe@gitlab.com 2017-10-16T15:14:42+00:00 38ff8cd13d447825d74e9496cb9c72bedb6e0f7e Adds requirements that supports anything in sha params Closes #26561 and #2709 See merge request gitlab-org/gitlab-ce!14462 
Adds requirements that supports anything in sha params

Closes #26561 and #2709

See merge request gitlab-org/gitlab-ce!14462
 Merge branch 'zj-add-performance-changelog-cat' into 'master' 2017-10-16T14:57:45+00:00 Robert Speicher robert@gitlab.com 2017-10-16T14:57:45+00:00 3d48d9777cf6e7e2e1779a6c9835ab260e48eb7a Add Performance category to the changelog Closes #36417 See merge request gitlab-org/gitlab-ce!14865 
Add Performance category to the changelog

Closes #36417

See merge request gitlab-org/gitlab-ce!14865
 Merge branch 'git-env-handle-arrays' into 'master' 2017-10-16T12:37:02+00:00 Sean McGivern sean@mcgivern.me.uk 2017-10-16T12:37:02+00:00 980423f6da0640c8ab8f35c2d56466502f54faef Add Gitlab::Git::Env.to_env_hash See merge request gitlab-org/gitlab-ce!14841 
Add Gitlab::Git::Env.to_env_hash

See merge request gitlab-org/gitlab-ce!14841
 Merge branch '38236-remove-build-failed-todo-if-it-has-been-auto-retried' into 'master' 2017-10-16T12:14:42+00:00 Grzegorz Bizon grzegorz@gitlab.com 2017-10-16T12:14:42+00:00 915120a60f7f7d5952fc2fe135a73071c94c3b00 Resolve "Remove "Build failed" TODO if it has been auto-retried" Closes #38236 See merge request gitlab-org/gitlab-ce!14869 
Resolve "Remove "Build failed" TODO if it has been auto-retried"

Closes #38236

See merge request gitlab-org/gitlab-ce!14869
 Add Gitlab::Git::Env.to_env_hash 2017-10-16T11:19:44+00:00 Jacob Vosmaer jacob@gitlab.com 2017-10-12T11:54:59+00:00 e73af42239cde041d9cfc323b9c3e004f205fe1a 






Merge branch 'conflict-resolution-refactor' into 'master'
2017-10-16T10:36:06+00:00

Sean McGivern
sean@mcgivern.me.uk

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

b2553840e88bed82bad45712e2696de83fac1230

Conflict resolution refactor

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




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

Sean McGivern
sean@mcgivern.me.uk

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

3a7623fc010832c337e0ba0eb8650d7f6fca3562

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

Closes #34431

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




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

Closes #34431

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






Don't create build failed todo when build is retried
2017-10-16T10:10:07+00:00

Sean McGivern
sean@gitlab.com

2017-10-13T15:26:17+00:00

6247886405b5f15e05750049254f2d341b9de72d

When a build is retried automatically, we close any open todos. However, we do
that _before_ creating a new build failed todo.

To solve this, we check if the build is retried before creating the todo. We
also ensure that the build _instance_ has the correct attribute set, without
needing to reload it from the database.





When a build is retried automatically, we close any open todos. However, we do
that _before_ creating a new build failed todo.

To solve this, we check if the build is retried before creating the todo. We
also ensure that the build _instance_ has the correct attribute set, without
needing to reload it from the database.







Popen with a timeout
2017-10-16T09:11:31+00:00

Andrew Newdigate
andrew@gitlab.com

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

f530261773b13df26457aa0d099f85e9791505c1












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

Kamil Trzciński
ayufan@ayufan.eu

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

076231798dd9716479d8eef118678eeb7c2c7b11

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




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