delta/gitlab/gitlab-ce.git/lib/api/users.rb, branch dm-notes-for-commit-id gitlab.com: gitlab-org/gitlab-ce.git Remove private_token from API user entity 2017-11-02T10:39:01+00:00 Douwe Maan douwe@selenight.nl 2017-10-12T08:26:13+00:00 fbdf057898475653c847601f257e140494944f46 






Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails
2017-10-05T10:48:22+00:00

Douwe Maan
douwe@selenight.nl

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

0c0c2ecd99cd5c4cb22a0c045f8d45d315203832

# 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





# 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







Support custom attributes on users
2017-09-28T16:49:42+00:00

Markus Koller
markus-koller@gmx.ch

2017-09-28T16:49:42+00:00

e9eae3eb0dd25e4a34c9a4b6bcc7de312dde4489












refactor emails service
2017-09-28T06:46:39+00:00

James Lopez
james@jameslopez.es

2017-09-27T14:39:10+00:00

1dcb7111107ed5a6b6258613d804b8da56af8b35












refactor users update service
2017-09-28T06:46:39+00:00

James Lopez
james@jameslopez.es

2017-09-27T09:48:33+00:00

67d06dee30379fc93be196e2cf509660d1661aea












refactor services to match EE signature
2017-09-28T06:46:39+00:00

James Lopez
james@jameslopez.es

2017-09-20T09:00:06+00:00

9621dd0c9d31508bdac2e2e226537302b560ef10












find_user users helper method no longer overrides find_user API helper method.
2017-09-26T18:14:19+00:00

Tiago Botelho
tiagonbotelho@hotmail.com

2017-09-21T14:10:33+00:00

d70b7a490dae32435c5c906bc6f923676c52a9ea












fix calls to Emails::DestroyService
2017-09-23T13:24:53+00:00

Brett Walker
brett@digitalmoksha.com

2017-09-13T12:47:09+00:00

b2d53791614da093a32fd7040371cf2054aa9817












Send a confirmation email when the user adds a secondary email address. Utilizes the Devise `confirmable` capabilities. Issue #37385
2017-09-23T13:23:11+00:00

Brett Walker
brett@digitalmoksha.com

2017-09-04T17:23:33+00:00

f9f467227538df0ce2012df39dfdcf55fb260f94












Ensure we use `Entities::User` for non-admin `users/:id` API requests
2017-09-15T23:34:52+00:00

Robert Speicher
rspeicher@gmail.com

2017-09-15T23:34:52+00:00

3cbaed97f1c085647bffcf8a729b72bc2a52d59e