delta/gitlab/gitlab-ce.git/spec/controllers/projects, branch sh-document-plus-encoding-api gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'master' into sh-security-fix-backports-master 2017-10-17T23:02:32+00:00 Stan Hu stanhu@gmail.com 2017-10-17T23:02:32+00:00 891a9ce8b0839fb478ca5704022b2e921097fe27 






Merge branch 'security-10-1' into '10-1-stable'
2017-10-17T22:58:58+00:00

Jen-Shin Lin
jen-shin@gitlab.com

2017-10-17T10:12:24+00:00

bd46c8abfd5ee964c47eff0ace021e45cbbe6687

Security fixes for 10.1 RC

See merge request gitlab/gitlabhq!2209




Security fixes for 10.1 RC

See merge request gitlab/gitlabhq!2209






Merge branch 'zj-gitaly-n-1-call-test' into 'master'
2017-10-17T11:15:39+00:00

Douwe Maan
douwe@gitlab.com

2017-10-17T11:15:39+00:00

f69b54682fc1770a73c528032b1a86f3e7d547a1

Allow testing on Gitaly call count

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




Allow testing on Gitaly call count

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






Allow testing on Gitaly call count
2017-10-16T11:25:51+00:00

Zeger-Jan van de Weg
git@zjvandeweg.nl

2017-10-12T08:39:11+00:00

61f4d08b7bf734c9af579e54fa8c74ac1bde4b39

Previous efforts were aimed at detecting N + 1 queries, general
regressions are hard to find and mitigate.





Previous efforts were aimed at detecting N + 1 queries, general
regressions are hard to find and mitigate.







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







Stop using `branch_names.include?` and use `branch_exists?`
2017-10-10T14:56:04+00:00

Andrew Newdigate
andrew@gitlab.com

2017-10-10T14:56:04+00:00

47d19c2de1df14bb3ab00d051be8e4f19f4ed7c4












Add a project forks spec helper
2017-10-07T09:46:23+00:00

Bob Van Landuyt
bob@vanlanduyt.co

2017-09-29T08:04:50+00:00

e8ca579d88703aeeaa64dbf4ac45f73a60181568

The helper creates a fork of a project with all provided attributes,
but skipping the creation of the repository on disk.





The helper creates a fork of a project with all provided attributes,
but skipping the creation of the repository on disk.







Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' into 'master'
2017-10-06T17:06:55+00:00

Kamil Trzciński
ayufan@ayufan.eu

2017-10-06T17:06:55+00:00

fb70fadaca6d2ce30730e9a6c995ad8e4f0526e3

Create Kubernetes cluster on GKE from k8s service

Closes #35954

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




Create Kubernetes cluster on GKE from k8s service

Closes #35954

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






Merge branch '18608-lock-issues-v2' into 'master'
2017-10-06T16:47:27+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-10-06T16:47:27+00:00

a68a39e34120e0cf67d95e143326d03f61288cdf

Resolve "Lock issue and merge request"

Closes #18608

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




Resolve "Lock issue and merge request"

Closes #18608

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