# Conflicts:
#	doc/user/project/quick_actions.md
#	locale/gitlab.pot
#	spec/services/quick_actions/interpret_service_spec.rb

[ci skip]

Bump rugged to 0.27.4 for security fixes

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

CE upstream - 2018-08-12 18:21 UTC

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

Add Noto Color Emoji font support

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

See https://github.com/libgit2/libgit2/releases for more details.

This is a font from [Google](https://www.google.com/get/noto/).

Arch Linux [has a recommendation of it](https://wiki.archlinux.org/index.php/fonts#Emoji_and_symbols).

Add info about this into `docs/user/markdown.md#emoji`

Added docs for Web IDE Client Evaluation

Closes #50143

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

Improve visuals of language bar on projects

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

Resolve "`Copy to Clipboard` tooltip appears under modal"

Closes #41996

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

port "copy to clipboard tooltip appears under modal" to EE

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

Fixed small scroll area in Web IDE

Closes #50242

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

Fix logins via OAuth2 geting logged out in an hour

Closes #50210

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

Fix pipeline fixture seeder

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

Resolve "Auto DevOps: Pass proxy variables to build environments"

Closes #50243

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

Rails5 fix passing Group objects array into for_projects_and_groups milestone scope

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

Optimize querying User#manageable_groups

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

Resolve "`/tag` quick action on Commit comments"

Closes #45663

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

/tag quick action on commits

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

See https://gitlab.com/gitlab-org/gitlab-ci-yml/merge_requests/184

Thanks to @kinolaev for this contribution.

Get the `merge-base` of 2 refs trough the API

Closes #49850

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

Closes #50242

Improve terminal button on job log page

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

This adds an endpoint to get the common ancestor of 2 refs from the API.

See Danger's suggestions:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6869#note_93730253

Fix specs failing on duplicate gpg signature

Closes #50224

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

Modified find project method to return nil if project not found

Closes #5300

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

Update notifications.md to remove non-existent notifications

Closes #4102

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

Update diff docs regarding note diff file usage

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

Creates vue component for shared runner limit

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

Creates vue component for warning block about stuck runners

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