# Conflicts:
#	CHANGELOG.md
#	app/assets/javascripts/api.js
#	app/assets/stylesheets/framework/variables.scss

[ci skip]

Eliminate unnecessary and duplicate system hook fires

Closes #50549

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

Added store for file templates in the Web IDE

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

EE port of ide-file-templates-store

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

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

Closes gitlab-ce#40550

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

[QA] Fix a 'superclass must be a Class' error

Closes gitlab-qa#317

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

Avoid nil safe message

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

Bump fog-google to 1.7.1 and google-api-client to 0.23.0

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

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

Resolve "Cherry-picking: Confirmation message should include target branch name"

Closes #41441

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

API: Catch empty commit messages

Closes #50268, #50266, and #50265

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

Api empty project snippets

Closes #50270

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

Add UI for maven packages feature

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

API: Add shared project's expiration date

Closes #46107

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

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

[ci skip]

[ci skip]

[ci skip]

Docs update ha aws diagram

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

Fix SQL error when sorting 2FA-enabled users by name in admin area

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

Remove another batch of reassigned scss variables

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

# Conflicts:
#	config/routes.rb

[ci skip]

This is needed to support query parameters in `Fog::Storage::Google`.
See https://github.com/fog/fog-google/pull/409.

Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/49957

Previously `SystemHookPushWorker` would always be called after a push event,
and this would queue a Sidekiq job regardless of whether any system hooks
needed that event. Moreover, another call inside `Project#execute_hooks` would
also fire system hooks if they existed.

This change both removes the duplicate system hook calls. For installations
without system hooks for push events, this change also can save significant
amount of RAM used by Redis.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50549

CE upstream - 2018-08-21 07:49 UTC

Closes gitlab-org/quality/staging#2

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

Don't use arguments keyword in gettext script

Closes #50457

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

Moves spec files for job log components into components folder

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

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

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

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

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

Resolve "Download artifacts button not available on mobile"

Closes #50524

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

make `karma -f` work again

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