delta/gitlab/gitlab-ce.git/spec/controllers, branch sh-document-plus-encoding-api gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'sh-security-fix-backports-master' into 'master' 2017-10-18T11:08:04+00:00 Robert Speicher robert@gitlab.com 2017-10-18T11:08:04+00:00 11dfe0489b1bbe7f0e43eaa72fcdf7140efcbc2f Backport all fixes from GitLab 10.1 into master See merge request gitlab-org/gitlab-ce!14922 
Backport all fixes from GitLab 10.1 into master

See merge request gitlab-org/gitlab-ce!14922
 Merge branch '30140-restore-readme-only-preference' into 'master' 2017-10-18T10:54:52+00:00 Douwe Maan douwe@gitlab.com 2017-10-18T10:54:52+00:00 cddc504740eea1e017c1ce23b84c6b19044020f4 Add readme only option as project view Closes #30140 See merge request gitlab-org/gitlab-ce!14900 
Add readme only option as project view

Closes #30140

See merge request gitlab-org/gitlab-ce!14900
 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






Merge branch 'bvl-group-trees' into 'master'
2017-10-17T10:03:03+00:00

Douwe Maan
douwe@gitlab.com

2017-10-17T10:03:03+00:00

79e889122b9f1cb41eb75ee33e94e625a8c679e2

Show collapsible tree on the project show page

Closes #30343

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




Show collapsible tree on the project show page

Closes #30343

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






Add readme only option as project view
2017-10-16T22:33:20+00:00

Annabel Dunstone Gray
annabel.dunstone@gmail.com

2017-10-16T20:21:51+00:00

a42d7980af0ccad036a68cb5497049464be0b2dc












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.







Make sure we always return an array of hierarchies
2017-10-13T13:15:45+00:00

Bob Van Landuyt
bob@vanlanduyt.co

2017-10-13T13:13:52+00:00

4d79159973d7b51230ceb9efd33bb1cbb191621b

Even when we pass an array of only a single object





Even when we pass an array of only a single object







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.