[ci skip]

Fix gitlab rake:import:repos task for 9.5.x

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

This backports !14597 for the 9.5.x branch.

Because of a change in GitLab 9.5.4 to prevent users from assuming control of
a repository already on disk, the import task broke. Imports would fail with
the message, "There is already a repository with that name on disk".

This change skips the validation when the import is done from the
command-line.

Closes #37682

[ci skip]

Handle error when fetching ref for MR with deleted source branch

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

Upgrade Nokogiri because of CVE-2017-9050

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

Update "x/x discussions resolved" checkmark icon to be green when all discussions resolved

Closes #37465

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

Fix MR widget with external CI services/integrations

Closes #33287

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

Fix MR widget with ready to merge buttons/controls at mobile breakpoint

Closes #37259

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

If the ref doesn't exist, and the source branch is deleted, we can't get it back
easily. Previously, we ignored this error by shelling out, so replicate that
behaviour.

[ci skip]

Resolve "New issue from failed build no longer links to failed build"

Closes #36907

See merge request !13790

Fix: GPG tmp dir removal race condition

Ignore any errors when removing the tmp directory, as we may run into a
race condition:
The `gpg-agent` agent process may clean up some files as well while
`FileUtils.remove_entry` is iterating the directory and removing all its
contained files and directories recursively, which could raise an error.

Closes #36998

See merge request !14194

# Conflicts:
#   db/schema.rb

Fix project feature being deleted when updating project with invalid visibility level

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

Merge branch 'fix/sm/37559-pipeline-triggered-through-api-not-showing-trigger-variables' into 'master'

Fix `ci_builds` to have an associated `trigger_request_id`

See merge request !14244

Pick for 9.5: "Refactor how we fetch ref for merge requests"

See merge request !14213

Refactor how we fetch ref for merge requests

Closes #36089 and #36296

See merge request !13416

alternative is to pick !13872

changed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13984/

Use rspec-parameterized for table-based tests

Closes #35804

See merge request !13469

This reverts commit dd406182, reversing
changes made to d5d24976.

GPG signature must match the committer in order to be verified

See merge request !13771

Perf.slow issuable

Closes #32844

See merge request !13685

Only update the sidebar count caches when needed

See merge request !13878

Improve migrations using triggers

Closes #36633

See merge request !13666

Fix new_sidebar.scss being out of date

See merge request !14035

Fix new navigation wrapping caret and increasing height

Closes #36821

See merge request !13967

Fix buttons with different height in merge request widget

Closes #37331

See merge request !14000

Increase the timeout before aborting a storage access attempt

See merge request !14023

Creates an icon only for the discussions and puts back the old SVG for CI status

Closes #37406

See merge request !14042

Fix problems sanitizing URLs with empty passwords

Closes gitlab-ee#3352

See merge request !14083

Fix a wrong `X-Gitlab-Event` header when testing webhooks

Closes #37288

See merge request !14108