This branch includes changes that removes a rake taks that cleans up
config.lock files.

This change bumps Gitaly so it happens automatically so users don't have
to bother.

These tasks are happening through housekeeping right now, by default
ever 10th push. This removes the need for these tasks.

Side note, this removes one of my first contributions to GitLab, as back
than I introduced these tasks through: 54e6c004

Closes https://gitlab.com/gitlab-org/gitaly/issues/768

Rails5 correct wrong geo job name

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

Use same aws-sdk gem versions for Rails 5 as for Rails 4

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

[ci skip]

[ci skip]

Extract EE-specific lines from issuable finders

Closes #6631

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

Allow Pseudonymizer to write to a bucket without having permissions to see all buckets

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

CE upstream - 2018-07-27 22:47 UTC

Closes gitaly#1295 and #6252

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

This is an EE-specific test that was broken by
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20871.

Calling `Fog::Storage::AWS::Directories#get` requires the ListAllMyBuckets
permission, but we can avoid that extra query and permission by initializing
the directory with a specific bucket.

API endpoint for configuring repository pull mirroring via HTTP

Closes #1499

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

Removed beta designation from Group SSO

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

View summed weights of issues in board column

Closes #3772

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

Wrap `[skip ci]` in quotes in Crowdin.yml

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

[EE port 20858] Rails5 update Gemfile.rails5.lock

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

Add License Management API to the backend

Closes #5488

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

# Conflicts:
#	Gemfile.rails5.lock
#	app/policies/concerns/policy_actor.rb
#	app/serializers/pipeline_serializer.rb
#	spec/javascripts/pipelines/graph/graph_component_spec.js
#	spec/javascripts/pipelines/graph/stage_column_component_spec.js
#	spec/serializers/pipeline_serializer_spec.rb

[ci skip]

Resolve "Red master: can't modify frozen String in app/views/projects/jobs/_sidebar.html.haml"

Closes #49681

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

Resolve "Unable to load 'lib/gitlab/kubernetes/helm'"

Closes #7027

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

[ci skip]

[ci skip]

[ci skip]

Merge branch '6877-geo-the-storage-config-in-the-other-section-is-broken-in-the-geo-nodes-admin-page' into 'master'

Resolve "Geo - The "Storage config" in the "Other section" is broken in the Geo nodes admin page"

Closes #6877 and #4851

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

Docs: add Starter badge to Jenkins integration

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

Update gitlab-shell version to 7.2.0

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