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
..
assets	Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails	2017-10-05 12:48:22 +02:00
controllers	Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails	2017-10-05 12:48:22 +02:00
finders	Support custom attributes on users	2017-09-28 16:49:42 +00:00
helpers	Updated Profile Events Helper to use SVG Sprite Icons	2017-10-04 08:53:36 +00:00
mailers	Send a confirmation email when the user adds a secondary email address. Utilizes the Devise confirmable capabilities. Issue #37385	2017-09-23 15:23:11 +02:00
models	Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails	2017-10-05 12:48:22 +02:00
policies	moved fork checks into policies	2017-09-29 12:14:39 +01:00
presenters	Reduce method calls while evaluating Projects::MergeRequestsController#show.json	2017-10-04 00:09:48 -03:00
serializers	Remove 'Repo' prefix from API entites	2017-10-05 19:48:05 +11:00
services	Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails	2017-10-05 12:48:22 +02:00
uploaders	Do not perform hard check (presence of file on storage)	2017-09-19 16:41:28 +02:00
validators	Move the key restriction validation to its own class	2017-08-30 20:50:44 +01:00
views	Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails	2017-10-05 12:48:22 +02:00
workers	Add support to migrate existing projects to Hashed Storage async	2017-09-28 16:32:14 +01:00