* upstream/master: (107 commits)
  Decrease ABC threshold to 55.25
  Adds a tooltip to the branch name
  Optimize system note service specs
  Decrease Metrics/PerceivedComplexity threshold to 17
  Upgrade mail and nokogiri gems due to security issues
  Link out to stackoverflow answer on setting swappiness
  Document swappiness recomendations in the requirements doc
  Migrate Repository.FetchRemote to Gitaly
  Fix invalid attribute used for time-ago-tooltip component
  Use the correct scope to avoid triggering all dropdowns
  fix :file_path - add requirements:
  Update latest artifacts doc
  Add changelog entry for flipping verify_certificates
  Default LDAP config verify_certificates to true
  Update share project with groups docs
  remove accidental console.log from karma tests
  update specs to match reorganized monitoring components
  Remove tooltips from new sidebar
  puts back `function` statements
  Removes disabled state from projects dropdown in dashboard page
  ...

Optimize system note service specs

See merge request !13958

Fix the /projects/:id/repository/files/:file_path/raw endpoint to handle dots in the file_path…

Closes #31470

See merge request !13512

Migrate Repository.FetchRemote to Gitaly

See merge request !13625

Decrease ABC threshold to 55.25

See merge request !13904

Removes disabled state from projects dropdown in dashboard page

Closes #37179

See merge request !13933

Adds a tooltip to the branch name

Closes #36917

See merge request !13925

Decrease Metrics/PerceivedComplexity threshold to 17

See merge request !13947

Resolve "Predefined Variable GITLAB_USER_NAME"

Closes #26692

See merge request !13824

Use google-protobuf 3.4.0.2

See merge request !13796

* master: (65 commits)
  Upgrade mail and nokogiri gems due to security issues
  Link out to stackoverflow answer on setting swappiness
  Document swappiness recomendations in the requirements doc
  Fix invalid attribute used for time-ago-tooltip component
  Update latest artifacts doc
  Add changelog entry for flipping verify_certificates
  Default LDAP config verify_certificates to true
  Update share project with groups docs
  remove accidental console.log from karma tests
  update specs to match reorganized monitoring components
  Remove tooltips from new sidebar
  Use `git update-ref --stdin -z` to delete refs
  Don't use public_send in destroy_conditionally! helper
  Remove unused expressions policy from ci/cd config
  Simplify code for appending strategies in CI/CD config
  Raise exception when simplifiable ci entry incomplete
  Add changelog entry
  Fix MySQL failure for emoji autocomplete
  max-width for lazy-loaded images (this was removed in the original MR through merge resolution most probably)
  Make namespace dropdown on new project page consistent
  ...

* ee/master: (89 commits)
  Merge branch '36807-gc-unwanted-refs-after-import' into tmp
  EE port of remove-sidebar-title
  Make namespace dropdown on new project page consistent
  Adds CE to EE compatibility with 2756
  Fixed Test
  Back to simple headlines without specific branching
  Add my-reaction filter (EE)
  Let's do JS later
  Add a spec when ressource is not modified
  Add changelog and doc
  Add tests for the unmodified header
  Update remaining endpoints
  Use commit date for branches and tags
  Conditionally destroy a ressource
  API: Respect the 'If-Unmodified-Since' for delete endpoints
  Fixes activation of project mirror when project is created.
  Kick off the pipelines again
  Fixed the default callout_id state
  Adjustments to calling logic
  Mapped correct setup
  ...

Make merge request version dropdowns consistent

See merge request !13590

Make namespace select dropdowns consistent

See merge request !13626

Remove accidental console.log from karma tests

See merge request !13936

Default LDAP config verify_certificates to true

Closes #33662

See merge request !13915

New syntax for CI/CD job triggering policy that supports variables expressions

See merge request !13769

Fixed fly-out nav jumping

Closes #36699

See merge request !13690

Upgrade mail and nokogiri gems due to security issues

See merge request !13662

Document swappiness recomendations in the requirements doc

See merge request !13943

Rename prometheus Vue components

See merge request !13938

Make namespace dropdown on new project page consistent

See merge request !2789

Make namespace dropdown on new project page consistent

See merge request !13628

- `Gitlab::Shell.fetch_remote` now takes a `Gitlab::Git::Repository` instead

Increase z-index of dropdowns

Closes #36766 and #36866

See merge request !13889

Fix invalid attribute used for time-ago-tooltip component

Closes #37163

See merge request !13899

Update latest artifacts doc

See merge request !13924