Save and expose only generic merge error

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

Merge branch '45970-broken-master-in-spec-features-issues-user_uses_slash_commands_spec-rb' into 'master'

Resolve "Broken master in spec/features/issues/user_uses_slash_commands_spec.rb"

Closes #45970

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

Move WorkInProgress vue component

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

Move SidebarTimeTracking vue component

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

Move TimeTrackingNoTrackingPane vue component

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Platform: Use component to emit event on Subscription toggle component instead of eventHub

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

Improve quick actions summary preview

Closes #45892

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

Replace the `project/source/markdown_render.feature` spinach test with an rspec analog

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

[Rails5] Fix spec/services/applications/create_service_spec.rb

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

[Rails5] Fix spec/models/notification_setting_spec.rb

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

[Rails5] Fix enum question mark methods

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

Display and revoke active sessions

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

[Rails5] Fix `undefined method 'downcase'` errors in requests specs

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

[Rails5] Add `touch_later` to `Commit` model

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

[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

When an error occurs during merge, the error message is exposed to user
and it is also saved in DB. This error message may be user unfriendly
(as in !41820) and it could also expose a detailed backend information.

Instead of displaying the specific error message, only sanitized generic
message is displayed. This is potentially controversial change because
disadvantage is that user doesn't get specific reason of failure.

Additional changes:
* repository.merge including exceptions is is extracted into a
separate method to make things clearer
* update! is used instead of update so we don't silently ignore
an error

Related to !41857

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