app/controllers/projects_controller.rb · cde1181df4e978ca99f87e4cc87664ffd362584d · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-03 · cde1181d
GitLab Bot authored Sep 03, 2018
```
# Conflicts:
#	doc/api/settings.md
#	lib/gitlab/email/handler.rb
#	locale/gitlab.pot

[ci skip]
```
cde1181d