commit 79858a631af97c2857700fa44c0e7ba09d621e12
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri Aug 25 23:33:04 2017 +0900

    Fix doc

commit d0c864c7f1522bd254458a7d6e1002352f34a143
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Tue Aug 22 22:27:32 2017 +0900

    Add tests

commit 1628eb8598f8ad0e6b573f3fb4fdcf5c3776885b
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Tue Aug 22 10:14:44 2017 +0000

    Update .gitlab-ci.yml

commit 440a3cdd0bb5d7b83f861f6d3762510b40df984a
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri Aug 18 14:46:56 2017 +0000

    Update build.rb

commit e925951e35c889bfc0520ce056e7df7befdeb93b
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Thu Aug 17 18:13:17 2017 +0900

    Add changelog

commit 7de5b4f50fc1ff6987c9a861c057c816d4fb285d
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Thu Aug 17 18:11:53 2017 +0900

    ini

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 !13628

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

Remove unwanted refs after importing a project

Closes #36807

See merge request !13766

Improve migrations using triggers

Closes #36633

See merge request !13666

Add time stats to Issue and Merge Request API

Closes #28453

See merge request !13335

Removed tooltips from new sidebar

Closes #35658

See merge request !13489

Update share project with groups docs

See merge request !13843

* upstream/master:
  Don't use public_send in destroy_conditionally! helper
  Fix MySQL failure for emoji autocomplete
  max-width for lazy-loaded images (this was removed in the original MR through merge resolution most probably)
  Replace 'project/user_lookup.feature' spinach test with an rspec analog
  Move GPG signed commits docs to new location

Closes #35658

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

See merge request !13863

Resolve "Mysql2::Error: Unknown column 'award_emoji.count' on master"

Closes #37231

See merge request !13926

Resolve "README.md: Header image scale not limited"

Closes #37058, #37024, and #37230

See merge request !13869

As we only override in two places, we could just ask for the value rather than
the method name.

Move GPG signed commits docs to new location

Closes #36804

See merge request !13872

* upstream/master: (225 commits)
  Add changelog entry
  Backports EE 2756 logic to CE.
  Make rubocop happy
  Make profile settings dropdown consistent
  Add filter by my reaction
  Update spec initialization with it being a shared component
  Update identicon path and selector
  Renamed to `identicon` and make shared component
  Merge branch 'master-i18n' into 'master'
  Fix broken Frontend JS guide
  Replace 'project/star.feature' spinach test with an rspec analog
  Adds position fixed to right sidebar
  Fixes the margin of the top buttons of the pipeline page
  Remove commented out code
  Better align fallback image emojis
  Decrease Metrics/CyclomaticComplexity threshold to 15
  Add changelog
  Respect the default visibility level when creating a group
  Further break with_repo_branch_commit into parts
  Make sure inspect doesn't generate crazy string
  ...

Update backup_restore.md documentation regarding S3 and IAM profiles.

See merge request !13871

Perf.slow issuable

Closes #32844

See merge request !13685

Improve AutocompleteController#users.json performance

Closes #36879

See merge request !13754

Postgres lets you treat `count` as another alias for `COUNT(*)` apparently, even
if that's not the actual alias used.

Fixes the margin of the top buttons of the pipeline page

Closes #34990

See merge request !13908

Respect the default visibility level when creating a group via the API

Closes #37198

See merge request !13903

API: Respect the 'If-Unmodified-Since' for delete endpoints

See merge request !9621

Make file template dropdowns consistent

See merge request !13577

Make profile settings dropdown consistent

See merge request !13623

Backports EE 2756 logic to CE.

See merge request !13892