There is a bug https://github.com/rails/arel/issues/531 in Rails 5.0 and
5.1 in Arel/ActiveRecord.

This commit converts arel based queries to their raw counterparts to
make the finder work in Rails 5.0.

These changes should be reverted when on Rails 5.2 as since that version
such queries work well again. See the bug link.

Remove the btn-xs class from the stylesheets

Closes #46743

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

Resolve "Merge request diff loading icon not visible"

Closes #47830 and #47849

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

Remove card class from the git-empty containers

Closes #47847

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

Bring changes from EE for parallel_importer.rb

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

Flex board columns

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

Render access denied without message

Closes #47844

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

Add support for verifying remote uploads, artifacts, and LFS objects in check rake tasks

Closes #47139

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

QA: Only clear the sessions if there's no error with a block

Closes gitlab-qa#197

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

Database migrations should have a changelog entry.

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

Removes merge conflicts vue code from globalnamespace

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

Fix UX handbook link in contribution guide

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

ListCommitByOid isn't called with an empty batch

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

Use Gitaly 0.105.1

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

Resolve "Board list creation is broken"

Closes #47823

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

The `errors/access_denied` page should not fail to render when no
message is provided.

When accessing something as a sessionless user, we should also display
the terms message if possible.

Because otherwise capybara-screenshot/rspec can't
take the screenshots for us. If we got an error,
we don't want to continue anyway?

resolving MR 19611-fix/enhance start-using-git doc

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

Resolve "Scrolling tabs are broken on profile, activity, and projects"

Closes #47501

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

* master:
  Add documentation: Overview of Frontend Testing
  Resolve "Add `/confidential` quick action for issues"
  i18n: externalize strings from 'app/views/award_emoji'
  Fix broken tests due to bad conflict resolution
  Updates eslint rules
  Documentation does not need an exception to be picked
  Fix conflicts caused by vue_shared/components/user_avatar/user_avatar_image.vue
  [Rails5] Fix `storage_counter` helper
  Adjust SQL and transaction Prometheus buckets
  Updates eslint vue plugin version

Batching commits for performance improvements, might lead to empty
batches being used. This isn't the case yet, but to guard against this
in future cases, a guard clause is added.

Add documentation: Overview of Frontend Testing

Closes #45732

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

Adjust SQL and transaction Prometheus buckets

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

Resolve "Add `/confidential` quick action for issues"

Closes #47145

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

Resolve "[Rails5] `StorageHelper#storage_counter uses commas as thousands separator` fails"

Closes #47375

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

Documentation does not need an exception to be picked

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

Updates eslint vue plugin version

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