* go-go-gadget-webpack: (90 commits)
  add CHAGELOG.md entry for webpack branch
  fix failing rspec build
  fix test failure for merge request widget
  fix duplicate data-toggle attribute
  update rake tasks
  fix frontend tests
  remove sprockets-es6 and execjs dependencies
  Improved code style on the issue_sidebar_spec.rb
  add CHAGELOG.md entry for !8831
  remove assets:compile step from relative_url docs
  update scripts and docs to reference the newly namespaced rake task
  namespace assets rake tasks to gitlab:assets:*
  correct gzip files if they exist as well
  automatically correct CSS urls on assets:precompile
  remove hard-coded assets path for ace editor modules
  Fixed cancel button in the services form not redirecting back to the integrations settings view
  Fix search bar search param encoding
  Fix a transient failure in the `Explore::ProjectsController` spec
  Fix filtering with multiple words
  Fix project name label's for reference in project settings
  ...

* master: (33 commits)
  Improved code style on the issue_sidebar_spec.rb
  add CHAGELOG.md entry for !8831
  remove assets:compile step from relative_url docs
  update scripts and docs to reference the newly namespaced rake task
  namespace assets rake tasks to gitlab:assets:*
  correct gzip files if they exist as well
  automatically correct CSS urls on assets:precompile
  remove hard-coded assets path for ace editor modules
  Fixed cancel button in the services form not redirecting back to the integrations settings view
  Fix search bar search param encoding
  Fix a transient failure in the `Explore::ProjectsController` spec
  Fix filtering with multiple words
  Fix project name label's for reference in project settings
  Fixed merge request tabs extra margin
  Don't call `#uniq` on a relation
  Move Gitlab::Shell and Gitlab::ShellAdapter files to lib/
  Move ApplicationSetting DEFAULTS to `.defaults` instead
  Move a begin/rescue clause to ApplicationSetting.expire
  Use badge partial as single source of truth instead of having 2 partials doing the same
  Changes after review
  ...

* master: (389 commits)
  Document "No gems fetched from git repositories" policy [ci skip]
  Typos
  Small gramatical tweaks
  Typos
  Added PHP & NPM doc
  Use `:empty_project` where possible in request specs
  Add caching of droplab ajax requests
  Use `:empty_project` where possible in model specs
  Revert 3f17f29a
  Remove unused js response from refs controller
  Add MR id to changelog entry
  fixed small mini pipeline graph line glitch
  Prevent form to be submitted twice
  Fix Error 500 when repositories contain annotated tags pointing to blobs
  Fix /explore sorting (trending)
  Simplify wording in "adding an image" docs
  Remove "official merge window" from CONTRIBUTING.md [ci skip]
  Update repository check documentation
  Fixed flexbox and wrap issues
  Update two_factor_authentication.md
  ...

Remove hard-coded absolute URLs from all frontend assets

See merge request !8831

Fixed Issuable sidebar so it remains closed on mobile/smaller screen devices

See merge request !7466

Merge branch '27248-filtered-search-does-not-allow-filtering-labels-with-multiple-words' into 'master'

Fix filtering label and milestone with multiple words

Closes #27248 and #27334

See merge request !8830

[EE] Resolve "NameError: uninitialized constant ApplicationSetting::DEFAULTS"

See merge request !1124

Resolve "NameError: uninitialized constant ApplicationSetting::DEFAULTS"

Closes #27280

See merge request !8805

Merge branch '26448-unnecessary-request-is-made-when-filter-input-box-is-focused-by-keyboard' into 'master'

Only search commits on input change since last search

Closes #26448

See merge request !8488

Fix search bar search param encoding

Closes #27398

See merge request !8753

Contribution calendar now scrolls right by default

See merge request !6192

Refactor fast-forward merge requests docs

See merge request !1137

[ci skip]

UI updates

See merge request !8669

Port of ui-updates to EE

See merge request !1113

Add rspec_profiling to the rspec environment

Closes #23034

See merge request !7854

Fix filtered search so that labels selected from discussion notes display correctly

See merge request !1122

Fixed cancel button in the services form not redirecting back to the integrations settings view

Closes #27301

See merge request !8843

Fix project name label's for reference in project settings

Closes #27259

See merge request !8795

Fix GitLab Pages not refreshing upon new content

Closes gitlab-com/infrastructure#1058

See merge request !1134

Fix a transient failure in the `Explore::ProjectsController` spec

Closes #27350

See merge request !8847

Friday CE upstream

Closes gitlab-ce#27044

See merge request !1136