# Conflicts:
#	app/assets/javascripts/boards/components/issue_card_inner.vue
#	app/assets/javascripts/boards/components/issue_time_estimate.vue
#	app/assets/javascripts/environments/components/environments_table.vue
#	app/assets/javascripts/jobs/components/job_app.vue
#	app/assets/stylesheets/pages/boards.scss
#	app/controllers/boards/issues_controller.rb
#	app/controllers/projects/autocomplete_sources_controller.rb
#	app/views/admin/application_settings/_email.html.haml
#	db/schema.rb
#	doc/ci/variables/README.md
#	doc/ci/yaml/README.md
#	doc/install/README.md
#	doc/user/admin_area/settings/email.md
#	lib/gitlab/ci/config/entry/job.rb
#	lib/gitlab/ci/config/normalizer.rb
#	locale/gitlab.pot
#	spec/finders/snippets_finder_spec.rb
#	spec/lib/gitlab/ci/config/normalizer_spec.rb
#	spec/models/user_spec.rb
#	spec/support/helpers/migrations_helpers.rb
#	spec/support/helpers/test_env.rb

[ci skip]

CE upstream - 2018-11-06 17:26 UTC

Closes gitaly#1336

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

Align sign in button

Closes #53673

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

Always proxy reports downloads

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

Prevent attr_encrypted models from being overriden

Closes gitlab-ee#8234

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

Paginate Bitbucket Server importer projects

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

Undo adding foreign key on geo_event_log.hashed_storage_attachments_event_id

Closes #8302

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

Fix failing spec in spec/controllers/admin/hooks_controller_spec.rb

attr_encrypted expects models to have their attribute methods defined,
or it will override them with standard Ruby accessors. Migration specs
that rolled back the state of the database after columns were migrated
to encrypted values were interfering with these definitions. To ensure
that the SystemHook specs pass, we need to call
`SystemHook.define_attribute_methods` to ensure that attr_encrypted sees
the right methods that reflect the latest state of the database.

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/8234

Warn when MR titles are too long.

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

Usage ping - Differentiate Jira Server and Cloud

Closes #51043

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

Fix e2e create merge request test

Closes gitlab-org/quality/nightly#32

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

This makes to always proxy reports

To prevent delays in loading the page and reduce memory usage, limit the
number of projects shown at 25 per page.

Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/50021

Allow to add patches to merge requests created via email

Closes #40830

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

Fix syntax error in initializers/fill_shards

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

CE backport - Chart showing issues created per month

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

Resolve "Issue board card design"

Closes #47008

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

EE Port of 47008-issue-board-card-design

Closes gitlab-ce#47008

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

Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'"

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

Add more logging for errors with kubernetes on helm install

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

Fix EKS formatting

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

Add refined sample linting configuration

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

Add more chaos to GitLab

Closes #53362 and #52767

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

Add more chaos to GitLab

Closes #53362 and #52767

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

Update Installation Guide for 11.5

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

Fix miss-aligned approvers dropdown (port to EE)

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

Fix misaligned approvers dropdown

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

Fix remove approver prompt cancel

Closes #6760

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

Docs: fix private access token -> personal access token

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