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
..
helpers	…
v3	…
access_requests.rb	…
api.rb	…
api_guard.rb	…
award_emoji.rb	…
boards.rb	…
branches.rb	…
broadcast_messages.rb	…
circuit_breakers.rb	…
commit_statuses.rb	…
commits.rb	…
custom_attributes_endpoints.rb	…
deploy_keys.rb	…
deployments.rb	…
entities.rb	…
environments.rb	…
events.rb	…
features.rb	…
files.rb	…
group_milestones.rb	…
group_variables.rb	…
groups.rb	…
helpers.rb	…
internal.rb	…
issues.rb	…
job_artifacts.rb	…
jobs.rb	…
keys.rb	…
labels.rb	…
lint.rb	…
members.rb	…
merge_request_diffs.rb	…
merge_requests.rb	…
milestone_responses.rb	…
namespaces.rb	…
notes.rb	…
notification_settings.rb	…
pagination_params.rb	…
pipeline_schedules.rb	…
pipelines.rb	…
project_hooks.rb	…
project_milestones.rb	…
project_snippets.rb	…
projects.rb	…
protected_branches.rb	…
repositories.rb	…
runner.rb	…
runners.rb	…
scope.rb	…
services.rb	…
session.rb	…
settings.rb	…
sidekiq_metrics.rb	…
snippets.rb	…
subscriptions.rb	…
system_hooks.rb	…
tags.rb	…
templates.rb	…
time_tracking_endpoints.rb	…
todos.rb	…
triggers.rb	…
users.rb	Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails	2017-10-05 12:48:22 +02:00
variables.rb	…
version.rb	…
wikis.rb	…