delta/gitlab/gitlab-ce.git/config, branch docs-pages-https

Merge branch 'zj-gitaly-server-info' into 'master'

2018-01-31T11:31:29+00:00

Gitaly Server info for admin panel

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

Gitaly Server info for admin panel

2018-01-31T07:54:45+00:00

Implements the client side for gitlab-org/gitaly#819. Which is a server
info command. This checks the server version and git binairy version on
the server.

A small UI was added for administrators, so they can check the status of
the Gitaly server. This is done for each storage the monolith knows.

Because of this commit, gitlab-org/gitlab-ce!15580 is now closed. That
MR removed the Git version too, but didn't replace it with anything.

Don't assume postgresql in two initializers

2018-01-30T19:00:44+00:00

Merge branch 'grape-router-helpers-bugfix' into 'master'

2018-01-30T10:03:31+00:00

Fix grape-route-helper route shadowing

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

Fix grape-route-helper route shadowing

2018-01-29T21:28:14+00:00

Bringing in https://github.com/reprah/grape-route-helpers/pull/21 as a
monkey patch since the grape-route-helpers project seems to be abandoned

Eliminate the last warning for redis wrapper

2018-01-26T11:42:48+00:00

Merge branch '42420-follow-up-from-resolve-asset-was-not-declared-to-be-precompiled-in-production-favicon-green-ico' into 'master'

2018-01-26T11:34:42+00:00

Port some non-EE-specific config/ changes to CE

Closes #42420

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

Merge branch 'lint-rugged' into 'master'

2018-01-25T17:52:01+00:00

Add a lint check to restrict use of Rugged

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

Merge branch '40028-special-characters-on-issuable-templates' into 'master'

2018-01-25T16:19:36+00:00

Handling special characters in Issuable Templates

Closes #40028

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

Port some non-EE-specific config/ changes to CE

2018-01-25T13:14:53+00:00

Signed-off-by: Rémy Coutable