delta/gitlab/gitlab-ce.git/app/controllers/admin/users_controller.rb, branch ide-diff-cursor

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

refactor emails service

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

refactor users update service

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

refactor services to match EE signature

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

fix calls to Emails::DestroyService

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

Revert "Merge branch 'revert-f2421b2b' into 'master'"

2017-09-11T15:44:42+00:00

This reverts merge request !14148

Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'"

2017-09-08T14:48:44+00:00

This reverts merge request !13619

Merge branch '23079-remove-default-scope-in-sortable' into 'master'

2017-09-07T16:15:32+00:00

Removes default scope from sortable

Closes #23079

See merge request !13558

Removes default scope from sortable

2017-09-07T12:01:59+00:00

Restore some changes from !9199

2017-09-06T17:54:09+00:00