app/controllers/application_controller.rb · 353585f097512c48da910d9a540b8f82565bc521 · nexedi / gitlab-ce · GitLab

You need to sign in or sign up before continuing.

Find file Blame History Permalink

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-11 · 353585f0
GitLab Bot authored May 11, 2018
```
# Conflicts:
#	features/steps/shared/authentication.rb

[ci skip]
```
353585f0