app/models/user.rb · f3a63bdc19b02fa7f35fcba5bc085da0daa92c4c · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-19 · f3a63bdc
GitLab Bot authored Jul 19, 2018
```
# Conflicts:
#	config/initializers/1_settings.rb
#	config/sidekiq_queues.yml

[ci skip]
```
f3a63bdc