All conflicts listed in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5482
are included

# Conflicts:
#	app/services/projects/destroy_service.rb
#	db/migrate/20161220141214_remove_dot_git_from_group_names.rb
#	db/schema.rb
#	locale/gitlab.pot
#	spec/factories/projects.rb
#	spec/helpers/projects_helper_spec.rb

[ci skip]

Gitlab::Shell works on shard name, not path

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

Legacy disk path refactor

Closes gitaly#1111

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

Fix tabs container styles to make RSS button clickable

Closes #45398

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

The columns effected store the repository storage path, which can't be
NULL. So in general the path can't be NULL. However, the tables also
include the shard name. From the shard name, the storage path can be
determined, allowing for a more dynamic approach.

During the review of gitlab-org/gitlab-ee!5389 it was noticed that the
docs mandated ignoring a column first, and a release later dropping it.

Given this migration is nearly finished, I've reverted the changes in
one commit so this commit can be reverted itself and picked on a new
branch.

Picked from CE, from: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18364

But includes the EE changes too. Among the required changes are dropping
of repository_storage_path from Geo tables.

Geo stored `repository_storage_path` in four models, which initially was
modeled after the interface of Gitlab::Shell rather than storing only
the needed data. Given this inferred data had no place nor need to be
stored I opted for deleting it.

Restore label underline color

Closes #44177

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

Direct disk access is done through Gitaly now, so the legacy path was
deprecated. This path was used in Gitlab::Shell however. This required
the refactoring in this commit.

Added is the removal of direct path access on the project model, as that
lookup wasn't needed anymore is most cases.

Closes https://gitlab.com/gitlab-org/gitaly/issues/1111

Change instruction text to be more inclusive of those with accessibility requirements

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

Show group id in group settings

Closes #45516

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

Prepare change for internationalization
Update locale/gitlab.pot

CE upstream - 2018-04-25 09:26 UTC

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

Add documentation about resetting the Runner registration token

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

Migration cleanup for merge request's commit_count (rev 1)

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

Align project avatar on small viewports

Closes #36585

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

* processes any pending records which are not migrated yet
* bumps import_export version because of new commits_count attribute
* removes commits_count fallback method

Backport dev env check for storage settings deprecation

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

Avoid noisy deprecation warnings on test env

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

Replace the `admin/license.feature` spinach test with an rspec analog

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

Do not preload settings

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

Resolve "Burndown chart for group milestone"

Closes #3064

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

CE upstream - 2018-04-24 15:49 UTC

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

Resolve "Broken master with `static_analysis` and `karma` being broken"

Closes #45725

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

Mock Pager in Karma tests

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

The behavior was moved to ApplicationSetting#should_check_namespace_plan? in order to it keep being tested on test environments without needing a explicit stub

Resolve "Broken master with `static_analysis` and `karma` being broken"

Closes #45725

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

Resolve "Geo: undefined method `pending_delete?' for nil:NilClass in geo/repository_verification/secondary/single_worker.rb"

Closes #5751

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

Broken link fix

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