delta/gitlab/gitlab-ce.git/app/models, branch fix/github-doc gitlab.com: gitlab-org/gitlab-ce.git 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
 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






Merge branch 'gitlab-ee-1312-time-spent-at' into 'master'
2017-10-13T15:52:41+00:00

Sean McGivern
sean@mcgivern.me.uk

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

b0f98a2e8e7fde23666d57675f9340fa453d04a8

added date parameter for time tracking

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




added date parameter for time tracking

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






Merge branch '39032-improve-merge-ongoing-check-consistency' into 'master'
2017-10-13T11:10:47+00:00

Sean McGivern
sean@mcgivern.me.uk

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

c616200f821be630d6238a00ff08a77a60aeebe2

Make "merge ongoing" check more consistent

Closes #39032

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




Make "merge ongoing" check more consistent

Closes #39032

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






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












Simplify check for running job on Redis
2017-10-13T08:17:41+00:00

Oswaldo Ferreira
oswaldo@gitlab.com

2017-10-13T08:17:41+00:00

b78954c13d127d84fa1e10db83f51b23790aa526












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







Clean hierarchy of calls between models and Gitalb::Git for blob search
2017-10-13T01:03:09+00:00

Alejandro Rodríguez
alejorro70@gmail.com

2017-10-06T23:47:06+00:00

9cc15172deaa4582c5fd956cc163539041d018b1












Merge branch 'cache-issuable-template-names' into 'master'
2017-10-12T13:48:31+00:00

Douwe Maan
douwe@gitlab.com

2017-10-12T13:48:31+00:00

d964eb11a3090c2c3420b44f28da2d24cd652718

Cache issuable template names

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




Cache issuable template names

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