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

Closes gitlab-qa#322

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

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

Fix typo with Slack app: shash command -> slash command

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

The LDAP tab is no longer a button, but is now a link. Update the QA page
to check for a link.

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21386 re-introduced
the explicit creation of the project name separate from the project path.
Filling in the name does automatically populate the path, but the reverse
is not true. We now fill in the name instead of the path.

Closes https://gitlab.com/gitlab-org/gitlab-qa/issues/322

CE upstream - 2018-09-08 15:21 UTC

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

Resolve "Remove Gitlab::GitAccess#authed_via_jwt?"

Closes #51267

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

CE upstream - 2018-09-08 09:21 UTC

Closes gitlab-runner#2992 and #2934

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

Removed duplicate specs for `#usage_data` and moved ee specific checks for
`repository_size_limit` to ee/spec/controllers/admin/application_settings_controller_spec.rb