Merge branch '7309-geo-secondary-with-ldap-configured-can-t-update-last_credential_check_at-due-to-read-only-db' into 'master'

Resolve "Geo:  Secondary with LDAP configured can't update last_credential_check_at due to read-only DB"

Closes #7309

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

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

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

Improve system hook spec in spec/services/git_push_service_spec.rb

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

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

Closes gitlab-ce#50549 and gitlab-qa#317

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

EE- remove scss variables 4

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Update gitlab-svgs to 1.2.8

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

# 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