# Conflicts:
#	app/controllers/concerns/issuable_actions.rb
#	app/controllers/projects/issues_controller.rb
#	app/models/merge_request.rb
#	ee/app/controllers/ee/projects/issues_controller.rb

Add CE to EE guide for 10.2

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

Fix Geo Node admin screen no longer displaying data

Closes #3987

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

Move some ee-only views to top-level /ee directory

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

Move ee-only project controllers to top-level ee directory

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

Move ee-only group controllers to top-level ee directory

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

Move EE-only /admin controllers under top level /ee directory

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

As a result of f3ae99fa, SmartInterval was refactored to use a Promised-based
callback.

This MR also fixes a bug where objects were always showing "Not Available".

Closes #3987

Geo: Fix handling of nil values in advanced section on admin screen

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

Revert "add metrics tagging to the sidekiq middleware"

Closes #39958

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fix api_spec failure

Closes #3964

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

Add /groups/:id/subgroups endpoint to API

Closes gitlab-ce#32652

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

Re-enable some Geo specs

Closes #3923

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

Fix a spec to avoid writing to prometheus

Closes #3965

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