app/controllers/projects/application_controller.rb · 214b6b258ebb83cbb5928ebf01dbca291be6892e · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-04 · 214b6b25
GitLab Bot authored Sep 04, 2018
```
# Conflicts:
#	.gitlab-ci.yml
#	app/controllers/projects/application_controller.rb

[ci skip]
```
214b6b25