delta/gitlab/gitlab-ce.git/spec/controllers, branch gitlab-git-popen-2

Fix the filesystem shard health check to check all configured shards

2017-09-19T10:05:42+00:00

Merge branch 'zj-update-project-settings' into 'master'

2017-09-19T06:58:51+00:00

Allow updating of project auto devops settings

Closes #37893

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

Eliminate N+1 queries in loading discussions.json endpoint

2017-09-18T13:53:33+00:00

In #37955,we see that the profile had a number of N+1 queries from repeated
access to `cross_reference_not_visible_for?`. This was optimized in previous
versions of GitLab by rendering all notes at once, counting the number of
visible references, and then using that number to check whether a system note
should be fully redacted.

There was also another N+1 query calling `ProjectTeam#member?`, which did not
take advantage of an optimization in prepare_notes_for_rendering that would
preload the maximum access level per project.

Closes #37955

Fix instance default option being true as value

2017-09-18T10:02:47+00:00

When a user selected 'Instance default' as value for the auto devops
settings, this was interpreted as a true value. Now we post an empty
string in this case, meaning we want to set `NULL` in the database.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37893#note_40541294

Allow updating of project auto devops settings

2017-09-15T07:53:31+00:00

Updating didn't work, as the project_id was missing to be set for the
project_auto_devops model.

Fixes gitlab-org/gitlab-ce#37893

Merge branch '34510-board-issues-sql-speedup' into 'master'

2017-09-14T08:30:11+00:00

fix #34510 add association preloading for issue boards

Closes #34510

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

fix another N+1 query for label priorities

2017-09-12T19:49:01+00:00

added a QueryRecorder for IssuesController#index.json

Merge branch 'revert-2f46c3a8' into 'master'

2017-09-12T18:31:54+00:00

Revert "Merge branch 'revert-f2421b2b' into 'master'"

See merge request !14190

Resolve "Error 500 in non-UTF8 branch names"

2017-09-12T14:07:31+00:00

Revert "Merge branch 'revert-f2421b2b' into 'master'"

2017-09-11T15:44:42+00:00

This reverts merge request !14148