# Conflicts:
#	app/controllers/admin/users_controller.rb

fix spec

added bang option to spec

use update service on ldap call and updated specs and service

update profiles controller to use new service

refactor profiles controller and update service

update users controller

finish off refactoring users controller

fix profiles controller

updated emails, notifications and passwords controller

update preferences controller

update notification settings, fix api specs

fix specs

fix api and controller issues

added service in the rest of controllers and classes

add emails service specs

add more spec examples

add create and destroy services for emails

fixed specs

update to use emails destroy service

fix specs

update missing email actions

add missing user updates

refactor emails service

more refactoring based on feedback

add missing action to block

more refactoring

fix spec failures

fix specs

refactor update user service not to do auth checks

CE upstream: Friday

Closes gitaly#333, gitlab-ce#34010, #2696, and gitlab-ce#33868

See merge request !2230

Add a EE::LicenseHelpers to easily enable/disable features

Closes #2657

See merge request !2220

Add documentation for GitLab ruby monitoring

See merge request !2222

Clarify terminology that authorized_keys box should be unchecked for Geo

See merge request !2226

Resolve "Related Issues BE followup - Add public API"

Closes #2633

See merge request !2123

Make JavaScript tests fail for unhandled Promise rejections

Closes #33845 and #33623

See merge request !12264

hot reloading for .vue files

Closes #33729

See merge request !12180

Add bootstrap_form gem

See merge request !10985

Add padding to target branch container

Closes #33992

See merge request !12353

Remove layout nav from scroll calculation

Closes #33984

See merge request !12399

Fix offset for fixed nav

Closes #34095

See merge request !12365

fix typos & add links in Push Rules docu [skip ci]

See merge request !757

Refactor Notes into ES class syntax

See merge request !12254

Remove unnecessary top padding on group MR index

See merge request !12392

Fix mobile environment detail view

Closes #34120

See merge request !12382

Fixes missing overflow on the right sidebar

See merge request !2224

Added limited width container to project settings

See merge request !12045

Without this a horizontal scrollbar appears

Fix dropdown position for the new button on mobile for the top navbar

Closes #34139

See merge request !12388