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

Merge branch '38236-remove-build-failed-todo-if-it-has-been-auto-retried' into 'master'

2017-10-16T12:14:42+00:00

Resolve "Remove "Build failed" TODO if it has been auto-retried"

Closes #38236

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

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

Don't create build failed todo when build is retried

2017-10-16T10:10:07+00:00

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.

Merge branch '35853-pages-missing-dotfiles' into 'master'

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

Include a .hidden directory in pages artifact extraction tests

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

added date parameter for time tracking

2017-10-13T10:41:49+00:00

Create a Gitlab::Git submodule for conlict-related files

2017-10-13T01:03:15+00:00

Rename classes to (hopefully) clearer names while we're doing that.

Refactor conflict resolution to contain git ops within Gitlab::Git

2017-10-13T01:03:14+00:00

This prepares the codebase for a Gitaly migration. See
https://gitlab.com/gitlab-org/gitaly/issues/553

Encapsulate git operations for conflict resolution into lib

2017-10-13T00:45:15+00:00

Merge branch '26763-grant-registry-auth-scope-to-admins' into 'master'

2017-10-12T20:59:03+00:00

Issue JWT token with registry:catalog:* scope when requested by GitLab admin

Closes #26763 and #18392

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

Include a .hidden directory in pages artifact extraction tests

2017-10-12T16:56:46+00:00