delta/gitlab/gitlab-ce.git, branch sh-optimize-discussion-json

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

Merge branch 'issue_37640' into 'master'

2017-09-16T05:09:20+00:00

Fix project feature being deleted when updating project with invalid visibility level

Closes #37640

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

Merge branch 'rs-default-user-entity' into 'master'

2017-09-16T01:08:27+00:00

Ensure we use `Entities::User` for non-admin `users/:id` API requests

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

Ensure we use `Entities::User` for non-admin `users/:id` API requests

2017-09-15T23:34:52+00:00

Merge branch 'master' into 'issue_37640'

2017-09-15T20:14:53+00:00

# Conflicts:
#   db/schema.rb

Merge branch 'grpc-1.6' into 'master'

2017-09-15T18:43:28+00:00

Use grpc 1.6.0

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

Merge branch 'fix-share-with-group-lock-update' into 'master'

2017-09-15T18:38:16+00:00

Fix setting share_with_group_lock

Closes #37916

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

Add data migration

2017-09-15T17:45:21+00:00

Fix setting share_with_group_lock

2017-09-15T15:38:46+00:00

Prior to this commit running
Namespace#force_share_with_group_lock_on_descendants would result in
updating _all_ namespaces in the namespaces table, not just the
descendants. This is the result of ActiveRecord::Relation#update_all not
taking into account the CTE. To work around this we use the CTE query as
a sub-query instead of directly calling #update_all.

To prevent this from happening the relations returned by
Gitlab::GroupHierarchy are now marked as read-only, resulting in an
error being raised when methods such as #update_all are used.

Fortunately on GitLab.com our statement timeouts appear to have
prevented this query from actually doing any damage other than causing
a very large amount of dead tuples.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37916

Merge branch '35917_create_services_for_keys' into 'master'

2017-09-15T15:35:24+00:00

created services for keys

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