We got both:

* ee/spec/features/projects/settings/issues_settings_spec.rb
* spec/features/projects/settings/issues_settings_spec.rb

But they're not the same! Also fix the descriptions

[ci skip]

[ci skip]

Port of add-per-runner-job-timeout to EE

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

Add Gitlab::ExclusiveLease to ObjectStorage#use_file

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

CE upstream - 2018-03-28 12:06 UTC

Closes #5461

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

Fix promoting labels and milestones copy text

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

Add canary favicon -- EE merge edition

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

Harmonize can-attach-file to match CE

Closes gitlab-ce#43915

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

Docs: replaces "Libre" => "Core"

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

QA: allow rspec files/options to be handled more consistently

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

Resolve "Temporary repositories in Geo sync download are broken"

Closes #5485

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

Remove EE-specific comment markers from CE -- EE merge edition

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

Move 'Registry' after 'CI/CD' navigation item  (EE Port)

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

Conflicts:
	app/views/ci/variables/_variable_row.html.haml
	app/views/import/github/new.html.haml
	app/views/projects/new.html.haml
	app/views/shared/_import_form.html.haml
	spec/javascripts/fixtures/projects.rb

Geo: Trigger wiki sync when enabled

Closes #5422

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

Move the API project import files ee/lib -> lib

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

Improve Gitlab::Git::Checksum#calculate

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

Make all workhorse gitaly calls opt-out, take 2, EE version

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

Test if remote repository exists before cloning

Closes gitlab-ce#43929

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

Merge branch '4870-skip-repository-changing-events-on-geo-secondaries-if-the-repository-hasn-t-been-backfilled-yet' into 'master'

Resolve "Skip repository-changing events on Geo secondaries if the repository hasn't been backfilled yet"

Closes #4870

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

Resolve "Skip repository-changing events on Geo secondaries if the repository hasn't been backfilled yet"

Geo: Hide checksum UI elements unless feature is enabled

Closes #5341

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

This reverts merge request !18002