delta/gitlab/gitlab-ce.git, branch mr-diff-data

Impove diff discussion data

2018-10-24T12:30:30+00:00

Pre-request to https://gitlab.com/gitlab-org/gitlab-ce/issues/48956

Merge branch 'patch-29' into 'master'

2018-10-24T11:41:07+00:00

Request to be a German proofreader

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

Merge branch 'mr-file-list' into 'master'

2018-10-24T10:57:58+00:00

Add list mode to file browser in diffs

Closes #51859

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

Merge branch 'zj-hotpatch-rspec' into 'master'

2018-10-24T09:51:14+00:00

Hotfix for Rspec and second storage

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

Merge branch 'sh-bump-protobuf-3.6' into 'master'

2018-10-24T09:41:52+00:00

Bump google-protobuf to 3.6.1

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

Hotfix for Rspec and second storage

2018-10-24T09:15:21+00:00

Rails requires a second storage for testing cross shard features. Gitaly
will not boot if this second storage doesn't exist. So this will create
this storage without adding it to the list of storages that Rails knows
about.

Bump google-protobuf to 3.6.1

2018-10-24T08:53:12+00:00

It looks like gRPC may have worked around
https://github.com/google/protobuf/issues/4210 via
https://github.com/grpc/grpc/pull/14634.

This is needed to support Ruby 2.5
(https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22555).

Merge branch 'add-security-dashboard-link-ce' into 'master'

2018-10-24T07:47:51+00:00

Sync group sidebar template with EE

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

Merge branch '53023-endless-scroll-loader-is-visible-on-user-profile-overview-page' into 'master'

2018-10-24T06:25:46+00:00

Resolve "Endless scroll loader is visible on user profile overview page"

Closes #53023

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

Resolve "Endless scroll loader is visible on user profile overview page"

2018-10-24T06:25:46+00:00