delta/gitlab/gitlab-ce.git/spec/models, branch patch-29 gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'dm-route-path-validation' into 'master' 2018-02-06T18:56:12+00:00 Sean McGivern sean@mcgivern.me.uk 2018-02-06T18:56:12+00:00 1f86e54910895b1683449d7aee6adbe3a1cc44a0 Validate user, group and project paths consistently, and only once See merge request gitlab-org/gitlab-ce!16903 
Validate user, group and project paths consistently, and only once

See merge request gitlab-org/gitlab-ce!16903
 Merge branch 'dm-user-namespace-route-path-validation' into 'master' 2018-02-06T18:40:09+00:00 Sean McGivern sean@mcgivern.me.uk 2018-02-06T18:40:09+00:00 e776096e84d01ab3d1d07a028b65e7430e195114 Validate user namespace before saving so that errors persist on model Closes #42140 See merge request gitlab-org/gitlab-ce!16902 
Validate user namespace before saving so that errors persist on model

Closes #42140

See merge request gitlab-org/gitlab-ce!16902
 Validate User username only on Namespace, and bubble up appropriately 2018-02-06T18:09:03+00:00 Douwe Maan douwe@selenight.nl 2018-01-31T17:39:03+00:00 a03d29da1dbbef3c202899cef3cd89b453a8b76f 






Validate path uniqueness only on Route, and bubble up appropriately
2018-02-06T18:06:38+00:00

Douwe Maan
douwe@selenight.nl

2018-01-31T16:52:09+00:00

75144b1e03db342730535f1f49b0e7cd2987d755












Validate user namespace before saving so that errors persist on model
2018-02-06T18:06:05+00:00

Douwe Maan
douwe@selenight.nl

2018-01-31T16:51:05+00:00

8d69436c901a3eee674e72c67d91de3994d30e0c












Merge branch 'master' into 'zj-wiki-page-versions'
2018-02-06T16:08:06+00:00

Douwe Maan
douwe@gitlab.com

2018-02-06T16:08:06+00:00

5db5a9cbd1192d776874a92e0a253c605f3c4417

# Conflicts:
#   Gemfile
#   Gemfile.lock




# Conflicts:
#   Gemfile
#   Gemfile.lock






Merge branch 'winh-kubernetes-clusters' into 'master'
2018-02-06T15:57:48+00:00

Phil Hughes
me@iamphill.com

2018-02-06T15:57:48+00:00

ba62493009c2360018709b660956a6173f3e1515

Replace "cluster" with "Kubernetes cluster"

Closes #41963

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




Replace "cluster" with "Kubernetes cluster"

Closes #41963

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






Merge branch '14256-upload-destroy-removes-file' into 'master'
2018-02-06T15:19:35+00:00

Sean McGivern
sean@mcgivern.me.uk

2018-02-06T15:19:35+00:00

9ab4c5b735e0e121996b092cb20bcdc423045c5e

Uploads should delete files when destroyed

Closes #14256

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




Uploads should delete files when destroyed

Closes #14256

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






Merge branch 'feature/sm/artifacts-trace' into 'master'
2018-02-06T14:18:26+00:00

Kamil Trzciński
ayufan@ayufan.eu

2018-02-06T14:18:26+00:00

ab41e9ad6e7e78c1b6dcef59fbde5f31c67c1d43

CE: Trace as artifacts (FileStorage only)

Closes gitlab-ee#4180

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




CE: Trace as artifacts (FileStorage only)

Closes gitlab-ee#4180

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






improvements from feedback
2018-02-06T13:48:56+00:00

Micaël Bergeron
mbergeron@gitlab.com

2018-01-31T15:59:35+00:00

939391af7bc471f1588ab75ab0cf08d8e4286a05