delta/gitlab/gitlab-ce.git/app/services, branch fix/github-doc gitlab.com: gitlab-org/gitlab-ce.git 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
 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
 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.
added date parameter for time tracking 2017-10-13T10:41:49+00:00 Vlad vlad.bilanchuk@teamvoy.com 2017-09-22T16:20:44+00:00 945e0684afc3c22ac658dbb68005cb2ebf5ac51c 






Create a Gitlab::Git submodule for conlict-related files
2017-10-13T01:03:15+00:00

Alejandro Rodríguez
alejorro70@gmail.com

2017-10-09T19:40:37+00:00

faa9bd402d3521b3f7b4cc2583f8ef1b3cceb821

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





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

Alejandro Rodríguez
alejorro70@gmail.com

2017-10-07T01:41:23+00:00

3fcab51ebb0f3156b5d732d050b292cd3e081262

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





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

Alejandro Rodríguez
alejorro70@gmail.com

2017-10-05T23:22:24+00:00

9fda629a347cb43d8f5871f101192187fcdeeea2












Merge branch '26763-grant-registry-auth-scope-to-admins' into 'master'
2017-10-12T20:59:03+00:00

Kamil Trzciński
ayufan@ayufan.eu

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

3555252d808d7d939e1dd508962abe8d94cbd667

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

Closes #26763 and #18392

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




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

Closes #26763 and #18392

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






Merge branch '34897-delete-branch-after-merge' into 'master'
2017-10-12T15:08:06+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-10-12T15:08:06+00:00

af3c98bb93ede723f305477122bfdce927066307

Resolve "remove source branch" checkbox from merge widget being ignored

Closes #34897

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




Resolve "remove source branch" checkbox from merge widget being ignored

Closes #34897

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






Merge branch '37691-subscription-fires-multiple-notifications' into 'master'
2017-10-12T14:39:51+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-10-12T14:39:51+00:00

ca06ff27874d96705b7878a17179ffb25d809aba

fix multiple notifications from being sent for multiple labels

Closes #37691

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




fix multiple notifications from being sent for multiple labels

Closes #37691

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