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	Remove 'Repo' prefix from API entites	2017-10-05 19:48:05 +11:00
access_requests.rb
api.rb	Exclude logging of API responses to prevent leakage of confidential data	2017-09-13 01:25:33 -07:00
api_guard.rb	Make sure API responds with 401 when invalid authentication info is provided	2017-09-28 14:17:52 +02:00
award_emoji.rb
boards.rb
branches.rb	Remove 'Repo' prefix from API entites	2017-10-05 19:48:05 +11:00
broadcast_messages.rb	Removes default scope from sortable	2017-09-07 13:01:59 +01:00
circuit_breakers.rb
commit_statuses.rb
commits.rb	Remove 'Repo' prefix from API entites	2017-10-05 19:48:05 +11:00
custom_attributes_endpoints.rb	Support custom attributes on users	2017-09-28 16:49:42 +00:00
deploy_keys.rb
deployments.rb
entities.rb	Remove 'Repo' prefix from API entites	2017-10-05 19:48:05 +11:00
environments.rb
events.rb
features.rb
files.rb
group_milestones.rb
group_variables.rb
groups.rb	Make Members with Owner and Master roles always able to create subgroups	2017-09-07 13:47:58 -05:00
helpers.rb	Ensure no exception is raised when Raven tries to get the current user in API context	2017-09-29 18:57:22 +02:00
internal.rb	add username to authorized result, so that gitlab-shell can pass it to hooks	2017-09-29 18:16:55 -04:00
issues.rb
job_artifacts.rb
jobs.rb
keys.rb
labels.rb
lint.rb	move lib/ci/gitlab_ci_yaml_processor.rb into lib/gitlab/ci/yaml_processor.rb	2017-09-12 22:32:02 +03:00
members.rb
merge_request_diffs.rb	Removes default scope from sortable	2017-09-07 13:01:59 +01:00
merge_requests.rb	Remove 'Repo' prefix from API entites	2017-10-05 19:48:05 +11:00
milestone_responses.rb	Removes default scope from sortable	2017-09-07 13:01:59 +01:00
namespaces.rb
notes.rb
notification_settings.rb	refactor users update service	2017-09-28 08:46:39 +02:00
pagination_params.rb
pipeline_schedules.rb
pipelines.rb
project_hooks.rb
project_milestones.rb
project_snippets.rb
projects.rb	Add an API endpoint to determine the forks of a project	2017-09-20 08:27:16 +10:00
protected_branches.rb
repositories.rb	Remove 'Repo' prefix from API entites	2017-10-05 19:48:05 +11:00
runner.rb
runners.rb
scope.rb
services.rb
session.rb
settings.rb
sidekiq_metrics.rb
snippets.rb
subscriptions.rb
system_hooks.rb
tags.rb	Remove 'Repo' prefix from API entites	2017-10-05 19:48:05 +11:00
templates.rb	Remove 'Repo' prefix from API entites	2017-10-05 19:48:05 +11:00
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	Add API support for wiki pages	2017-09-07 09:21:52 +11:00