Extract the EE-specific models/attributes from spec/lib/gitlab/import_export/all_models.yml to a new file

Closes #7471

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

CE upstream - 2018-09-10 10:57 UTC

Closes gitlab-ce#51295

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

Update pseudo file

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

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

Port of `/lock` and `/unlock` quick actions to EE

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

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

Clean up chart index page

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

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

# Conflicts:
#	app/helpers/selects_helper.rb

[ci skip]

Merge branch 'docs/51295-update-documentation-for-interactive-web-terminals-to-remove-beta-indicator' into 'master'

Remove beta from web terminal documentation

Closes #51295

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

Document permissions for different entities

Closes #50036

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

[QA] Fix arguments passed to RSpec::Core::Runner

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

CE upstream - 2018-09-10 09:22 UTC

Closes gitlab-qa#322

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

closes gitlab-org/gitlab-ce#51295

Enable frozen string for app/helpers/**/*.rb

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

EE Port of gitlab-ce!21320 (Enable frozen string for app/helpers/**/*.rb)

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

Fix LDAP QA specs failing due to button change

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

Update templates and licenses for 11.3

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

CE upstream - 2018-09-10 00:21 UTC

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

Resolve "On master, inline diff view contains extra `+` and `-` signs"

Closes #51281

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

Disable query limit counter in sidekiq

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

[EE] Disable query limit counter in sidekiq

Closes #7087

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

Use the current merge base between CE MR and EE MR

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

API: Use find_branch! in all places

Closes #51250

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

Explicitly enable usage ping for instance statistics spec

Closes #51294

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

Explicitly enable usage ping for instance statistics spec

Closes #51294

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

Ignore snowplow for eslint and prettier

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

Fix QA builds failing due to change in new project page behavior

Closes gitlab-qa#322

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

# Conflicts:
#	spec/features/projects/members/invite_group_spec.rb

[ci skip]

Add system note when due date is changed

Closes #38208

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

This is similar to https://gitlab.com/gitlab-org/gitlab-ee/issues/7511, but
the root cause is https://gitlab.com/gitlab-org/gitlab-ce/issues/51268.

Summit challenge - health check

Closes #7345

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

Update invite_group_spec to be consistent with EE

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