[Rails5] Fix Arel::UpdateManager

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

[Rails5] Fix `TZInfo::InvalidTimezoneIdentifier` exception

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

[Rails5] Use `safe_params` instead of `params` in `url_for` helpers

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

[Rails5] Update `ApplicationController#log_exception` to fix `undefined method 'clean'` error

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

Fix file_store for artifacts and lfs when saving

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

[Rails5] Fix `params` for DeleteUserWorker

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

Enable LFS setting UI for Masters and Owners

Closes #33320

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

Migrate pipeline stages indices

Closes #43009

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

Fix memory and performance issues in Karma test suite

Closes #45900 and #45806

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

Bump nokogiri to 1.8.2 in qa Gemfile

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

Use gitaly 0.96.2

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

Fix commit trailer rendering when Gravatar is disabled

Closes #45633

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

Resolves CVE-2017-18258

Use gitlab-workhorse 4.2.0

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

Use persisted diff data instead fetching Git on discussions

Closes #44052

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

LFS can be enabled and disabled per project using the API by Masters
and Owners, but the UI is only available to Admins. The interface and
API should be consistent.

LFS can also be enabled and disabled per group using the API by Owners,
but the UI is only available to Admins. This interface should also be
consistent.

Additionally removes an unneeded check if 2FA interface, since the
interface is only available to Owners.

Closes #33320

Add alpine mirrors while operating on k8s cluster

Closes gitlab-ee#4922

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

Merge request and commit discussions API

Closes #20901

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

* master: (106 commits)

Use Ruby methods, not Rails' String#first

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

[CE] Exclude LDAP from OmniauthCallbackController base methods

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

show only groups an admin is a member of in dashboards/grops

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

Gitaly-Ruby is not a Rails application, which made the method not exist
after the vendor. This patch uses direct indexing, which has the same
properties that `#first` has.

Found while working on: https://gitlab.com/gitlab-org/gitaly/merge_requests/699

Update timeline icon for description edit

Closes #39946

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

Fix spec/features/projects/issues/user_toggles_subscription_spec.rb

Closes #45918

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

Revert discussion counter height

Closes #45896

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

Today, when fetching diffs of a note, we always go to Gitaly in order to diff between commits and return the diff of each discussion note. With this change we avoid doing that for notes on the "current version" of the MR.

Fixed inconsistent protected branch pill baseline

Closes #41286 and #45354

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