Douwe Maan 0c0c2ecd99 Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails ... # Conflicts: # app/controllers/admin/users_controller.rb # app/controllers/confirmations_controller.rb # app/controllers/profiles/emails_controller.rb # app/models/user.rb # app/services/emails/base_service.rb # app/services/emails/destroy_service.rb # app/views/devise/mailer/confirmation_instructions.html.haml # lib/api/users.rb # spec/services/emails/destroy_service_spec.rb		2017-10-05 12:48:22 +02:00
..
admin.rb
api.rb
ci.rb
dashboard.rb
development.rb
explore.rb
git_http.rb
group.rb
help.rb
import.rb
legacy_builds.rb
profile.rb	moved devise_for :emails to live under profiles, removing the need	2017-09-23 15:26:04 +02:00
project.rb
repository.rb
sherlock.rb
sidekiq.rb
snippets.rb
test.rb
uploads.rb
user.rb	moved devise_for :emails to live under profiles, removing the need	2017-09-23 15:26:04 +02:00
wiki.rb