delta/gitlab/gitlab-ce.git/app/models, branch performance-bar-sql

Merge branch 'sh-security-fix-backports-master' into 'master'

2017-10-18T11:08:04+00:00

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

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

Merge branch 'security-10-1' into '10-1-stable'

2017-10-17T22:58:58+00:00

Security fixes for 10.1 RC

See merge request gitlab/gitlabhq!2209

Merge branch 'bvl-fix-deleting-forked-projects' into 'master'

2017-10-17T15:42:05+00:00

Fix errors when deleting a forked project

Closes #39196

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

Fix errors when deleting a forked project

2017-10-17T14:46:07+00:00

The problem would occur when the `ForkedProjectLink` was deleted, but
the `ForkNetworkMember` was not. The delete would be rolled back and
retried.

But the error would not be saved because `Project#forked?`
would still be true, because the `ForkNetworkMember` exists. But the
`Project#forked_project_link` would be `nil`. So the validation for
the visibility level would fail.

Merge branch 'prevent-creating-multiple-application-settings' into 'master'

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

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

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

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