delta/gitlab/gitlab-ce.git/lib/api/users.rb, branch gitlab-git-duplicate-code

Allow including custom attributes in API responses

2018-02-08T12:30:34+00:00

Add sorting options for /users API (admin only)

2018-02-06T14:00:33+00:00

Signed-off-by: Dmitriy Zaporozhets

Track and act upon the number of executed queries

2018-02-01T16:00:46+00:00

This ensures that we have more visibility in the number of SQL queries
that are executed in web requests. The current threshold is hardcoded to
100 as we will rarely (maybe once or twice) change it.

In production and development we use Sentry if enabled, in the test
environment we raise an error. This feature is also only enabled in
production/staging when running on GitLab.com as it's not very useful to
other users.

Added default order to UserFinder

2017-12-04T09:49:53+00:00

Skip confirmation user api

2017-11-21T15:47:58+00:00

Remove private_token from API user entity

2017-11-02T10:39:01+00:00

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

Support custom attributes on users

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

refactor emails service

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

refactor users update service

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