Fix project templates failures

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

# Conflicts:
#	app/models/repository.rb

[ci skip]

Fix failing 500 errors when deploy tokens are used to clone

Closes gitlab-ee#7080

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

Fix deploy tokens without `expire_at` crashes

Closes #49904

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

A DeployToken responds to `:username`, but it returns the username for the
token, not a User object. Don't attempt to log user activity in this case.

Closes gitlab-org/gitlab-ee#7080

Get rid of unnecessary commit action in pipelines controller

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

merge request https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6763

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

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

Make CNG_PROJECT_PATH configurable for releasing helm charts

Closes charts/gitlab#644

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

Fixed Web IDE row dropdowns scrolling list incorrectly

Closes #49892

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

Resolve "Top nav search bar produces console error when unauthenticated"

Closes #49861

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

Resolve "Extract EE specific files/lines for Discussion app/serializers"

Closes #6650

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

Resolve "GitLab Project Import should use object storage"

Closes #48773

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

Closes #49892

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

Remove feature flags from lib/backup

Closes gitaly#749, gitaly#1212, and gitaly#1195

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

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

Rework performance section to allow for string freezing

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

Merge branch '48834-chart-versions-for-applications-installed-by-one-click-install-buttons-should-be-version-locked' into 'master'

Resolve "Chart versions for applications installed by one click install buttons should be version locked"

Closes #48834

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

Fix indentation for artifacts example in docs

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

- Refactor uploads manager
- Refactor importer, update import spec
- Add more object storage specs

Use Helm 2.7.2 for GitLab Managed Apps

Closes #49830

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

Rails 5 fix product array method delagation by manually calling .to_a in NotificationService

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

Resolve "Remove ghost notification settings for groups and projects"

Closes #44824

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