https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9666#note_24877665

* upstream/master: (289 commits)
  re-add Assign to Me link on new MR/Issue forms
  thinner bottom header border
  make header match old 16px padding of body contents
  Update font-awesome-rails to 4.7.0.1
  Relax font-awesome-rails dependency to ~> 4.7
  Restore keyboard shortcuts for "Activity" and "Charts"
  fix border radius bottom for header
  match padding for mr-widget sections
  Update changelog
  Fix project-last-commit alignment
  Docs: update GL Pages IP on GL.com
  Fix up @DouweM review
  Remove readme-only project view preference
  Add `uploads` to known models for Import/Export spec
  Add `has_many` associations for models that can have Upload records
  Handle relative and absolute Upload paths in the Uploaders
  Change the default CarrierWave root path for tests
  Fix Projects::UploadService spec
  Add a Project::UploadsController spec to ensure an Upload is created
  Add `RecordsUploads` module to record Upload records via callbacks
  ...

Fix project-last-commit alignment

See merge request !9745

Remove readme-only project view preference

See merge request !9744

re-add Assign to Me link on new MR/Issue forms

Closes #23948

See merge request !9499

Merge request widget merged state styling

See merge request !9352

Resolve "Relax `font-awesome-rails` dependency"

Closes #19062

See merge request !9748

Add emoji images - Base Native Unicode Emojis

Closes #26371

See merge request !9569

Backport change introduced in EE - alias for empty states SVGs

See merge request !9683

Simplify project payload exposed on Environment endpoints in V4

Closes #28598

See merge request !9675

Use publish channel to post notifications changes

See merge request !9574

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

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

Restore keyboard shortcuts for "Activity" and "Charts"

Closes #28538

See merge request !9680

Native Unicode Emojis

See merge request !9570

Record file uploads in the database

See merge request !8893

Remove tooltips and titles from label subscription buttons

See merge request !9692

Docs: update GL Pages IP on GL.com

See merge request !9739

# Conflicts:
#   spec/models/group_spec.rb

Create Mattermost Team from GitLab

Closes #23964

See merge request !8746

This more closely resembles the development and production paths in that
paths contain `public/uploads`, rather than `uploads/uploads` as they
did before.

For reasons unknown, this spec was passing a project's repository as the
first argument to `Projects::UploadService`, while it was expecting the
project itself.

Previously this wasn't a problem because `FileUploader` only needed the
object to respond to `path_with_namespace`, which Repository and Project
both did. But now because of `Upload` and its polymorphic association,
it expects the object to respond to `primary_key`.