# Conflicts:
#	app/views/admin/application_settings/_account_and_limit.html.haml
#	app/views/admin/application_settings/_ci_cd.html.haml
#	app/views/admin/application_settings/_email.html.haml
#	app/views/admin/application_settings/_help_page.html.haml
#	app/views/admin/application_settings/_repository_mirrors_form.html.haml
#	app/views/admin/application_settings/_signup.html.haml
#	app/views/admin/application_settings/_visibility_and_access.html.haml
#	lib/api/users.rb

[ci skip]

Resolve two QA failures

Closes gitlab-qa#271

See merge request gitlab-org/gitlab-ce!19655

[EE] Resolve two QA failures

Closes gitlab-qa#271

See merge request gitlab-org/gitlab-ee!6093

Fixed IDE jobs empty state showing when loading

Closes #47766

See merge request gitlab-org/gitlab-ce!19706

Fix parsing of vulnerabilities file lines

See merge request gitlab-org/gitlab-ee!6100

Typo fix

See merge request gitlab-org/gitlab-ce!19720

Rails5 fix expected `issuable.reload.updated_at` to have changed

Closes #47366

See merge request gitlab-org/gitlab-ce!19733

[Rails5] Pass class references instead of strings to middleware builder

See merge request gitlab-org/gitlab-ce!19729

Resolve "`MigrateUploadsWorker` is doing N+1 queries on migration"

Closes #47408

See merge request gitlab-org/gitlab-ce!19547

Migrate compare_source_branch to use only Gitaly

Closes gitaly#771

See merge request gitlab-org/gitlab-ce!19700

Restoring user v3 endpoint

See merge request gitlab-org/gitlab-ee!6091

Restoring user v3 endpoint

Closes #47565

See merge request gitlab-org/gitlab-ce!19661

Resolve "Microsoft Teams notification for pipelines do not work"

Closes #42342

See merge request gitlab-org/gitlab-ce!19632

Added with_stats option to GET /projects/:id/repository/commits (API)

See merge request gitlab-org/gitlab-ce!19484

Resolve "Use one column form layout on Admin Area Settings page"

Closes #44674

See merge request gitlab-org/gitlab-ce!19673

Ee 44674 use one column form layout on admin area settings page

Closes gitlab-ce#44674

See merge request gitlab-org/gitlab-ee!6087

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve "Add link to Jenkins integration page"

Closes #5903

See merge request gitlab-org/gitlab-ee!6066

CE upstream - 2018-06-13 03:32 UTC

See merge request gitlab-org/gitlab-ee!6107

It fixes Rails 5.0 deprecation flooding like:

```
DEPRECATION WARNING: Passing strings or symbols to the middleware builder is deprecated, please change
them to actual class references.  For example:

  "::Gitlab::Middleware::ReadOnly" => Gitlab::Middleware::ReadOnly

 (called from <top (required)> at /builds/gitlab-org/gitlab-ce/config/environment.rb:11)
DEPRECATION WARNING: Passing strings or symbols to the middleware builder is deprecated, please change
them to actual class references.  For example:

  "ActionDispatch::Static" => ActionDispatch::Static

 (called from <top (required)> at /builds/gitlab-org/gitlab-ce/config/environment.rb:11)
DEPRECATION WARNING: Passing strings or symbols to the middleware builder is deprecated, please change
them to actual class references.  For example:

  "Gitlab::Testing::RequestBlockerMiddleware" => Gitlab::Testing::RequestBlockerMiddleware

 (called from <top (required)> at /builds/gitlab-org/gitlab-ce/config/environment.rb:11)
DEPRECATION WARNING: Passing strings or symbols to the middleware builder is deprecated, please change
them to actual class references.  For example:

  "ActionDispatch::Static" => ActionDispatch::Static

 (called from <top (required)> at /builds/gitlab-org/gitlab-ce/config/environment.rb:11)
DEPRECATION WARNING: Passing strings or symbols to the middleware builder is deprecated, please change
them to actual class references.  For example:

  "Gitlab::Testing::RequestInspectorMiddleware" => Gitlab::Testing::RequestInspectorMiddleware

 (called from <top (required)> at /builds/gitlab-org/gitlab-ce/config/environment.rb:11)
```

Resolve "Groups > Members > No padding between dropdowns/input"

Closes #46702

See merge request gitlab-org/gitlab-ce!19724

CE upstream - 2018-06-13 00:21 UTC

See merge request gitlab-org/gitlab-ee!6106

CE upstream - 2018-06-12 17:46 UTC

Closes #6382

See merge request gitlab-org/gitlab-ee!6103

Resolve "Participants tooltip is cutoff when too close to the window edge"

Closes #47551

See merge request gitlab-org/gitlab-ce!19669

Resolve "Admin area > Push rules > Checkboxes"

Closes #6210

See merge request gitlab-org/gitlab-ee!6096

Fix bootstrap popover class renames

Closes gitlab-ce#47727

See merge request gitlab-org/gitlab-ee!6085