[ci skip]

[ci skip]

[ci skip]

[ci skip]

Fix NoMethodError: undefined method `>' for nil:NilClass in license.rb

Closes #3513

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

Make branches page translatable

Closes gitlab-ce#32797

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

CE upstream: Friday

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

Add notes on authentication to PG HA document

Closes omnibus-gitlab#2735

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

Do not clone the repo when running the review-docs jobs

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

Resolve "Error 500 due to promote group Web hooks"

Closes #3498

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

UX guide update w/ new icon set

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

This is following the change in:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14442

Adds gitlab features and components to usage ping data.

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

Fix delta size check to handle commit or nil objects

Closes #3446

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

[ci skip]

[ci skip]

* upstream/master: (26 commits)
  Resolve "Better SVG Usage in the Frontend"
  Replace the 'project/service.feature' spinach test with an rspec analog
  Removed two legacy config options
  Fix rendering double note issue.
  IssueNotes: Switch back to Write pane when note cancel or submit.
  Upgrade Nokogiri because of CVE-2017-9050
  Bump VERSION to 10.1.0-pre
  Standardize access to CSRF token in JavaScript
  Do not clone the repo when running the review-docs jobs
  Don't memoize storage configuration on `FsShardsCheck`
  Document that group Owners can always create subgroups
  Auto DevOps docs cleanup
  Display full pre-receive and post-receive hook output in GitLab UI
  Simplify a test
  Adds EE tag detection to remove_old in gitlab backup.
  Correctly detect multiple issue URLs after 'Closes...' in MR descriptions
  new sharing permissions
  IssueNotes: Resize comment form after note submit and discard.
  [skip ci] Add changelog
  update spacing
  ...

Update database.md Geo docs to clarify Postgres needs to be manually restarted

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

Previously, we checked out the branch and ran the script from there.
However, when the MR got merged and the cleanup job was run it would
fail since it could not find the now deleted branch.

This commit rather downloads the script from GitLab and skips
downloading the artifacts/dependencies/cache to speed up the process.

Fix bad link on GitLab Omnibus Helm chart page - docs

Closes #38016

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

Simplify a test

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

Upgrade Nokogiri because of CVE-2017-9050

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

EE-Port "Better SVG Usage in the Frontend"

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

Resolve "Better SVG Usage in the Frontend"

Closes #36231

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

Add view replaced file link for image diffs

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

Do not clone the repo when running the review-docs jobs

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

Replace the 'project/service.feature' spinach test with an rspec analog

Closes #23036

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

Removed two legacy config options

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

Display full pre-receive and post-receive hook output in GitLab UI

Closes #25214

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

Fix rendering double note issue

Closes #38139

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

Upgrade Nokogiri because of CVE-2017-9050

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