delta/gitlab/gitlab-ce.git/app/services/emails/base_service.rb, branch remove-commit-tree

Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails

2017-10-05T10:48:22+00:00

# 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

spacing and small optimisations

2017-10-01T15:07:26+00:00

refactor emails service

2017-09-28T06:46:39+00:00

update initializers

2017-09-28T06:46:39+00:00

optimized the email services

2017-09-23T13:24:53+00:00

fix bug in emails destroy service

2017-06-23T14:44:34+00:00

more refactoring based on feedback

2017-06-23T09:41:42+00:00

add create and destroy services for emails

2017-06-23T09:41:42+00:00