delta/gitlab/gitlab-ce.git/spec/models, branch sh-document-plus-encoding-api gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'feature/migrate-wiki-write-page-to-gitaly' into 'master' 2017-10-18T11:13:50+00:00 Sean McGivern sean@mcgivern.me.uk 2017-10-18T11:13:50+00:00 ed194a6d4af3e51246c8cb1927c0e4cc9fea5321 Migrate Gitlab::Git::Wiki#write_page to Gitaly Closes gitaly#638 See merge request gitlab-org/gitlab-ce!14870 
Migrate Gitlab::Git::Wiki#write_page to Gitaly

Closes gitaly#638

See merge request gitlab-org/gitlab-ce!14870
 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 'prevent-creating-multiple-application-settings' into 'master'
2017-10-17T13:53:42+00:00

Yorick Peterse
yorickpeterse@gmail.com

2017-10-17T13:53:42+00:00

65a1cbc600cf36ff5db9644072e4bf1e2b8e5cde

Prevent creating multiple ApplicationSetting by forcing it to always have id=1

Closes #34728

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




Prevent creating multiple ApplicationSetting by forcing it to always have id=1

Closes #34728

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






Merge branch 'bvl-circuitbreaker-improvements' into 'master'
2017-10-17T10:43:05+00:00

Douwe Maan
douwe@gitlab.com

2017-10-17T10:43:05+00:00

4bbdab764d808a86e2e726b4a717a64da8655a10

Make the circuitbreaker configurable at runtime

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




Make the circuitbreaker configurable at runtime

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






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






Allow configuring the circuitbreaker through the API and UI
2017-10-17T09:50:32+00:00

Bob Van Landuyt
bob@vanlanduyt.co

2017-10-12T14:35:59+00:00

38af7c1613e75561b405b15d6b8db1724da59ef6












Migrate Gitlab::Git::Wiki#write_page to Gitaly
2017-10-16T13:53:48+00:00

Ahmad Sherif
me@ahmadsherif.com

2017-10-13T13:11:53+00:00

fa5eeaecfb85d428395ef76999c60f37cf185990

Closes gitaly#638





Closes gitaly#638







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