# Conflicts:
#	app/assets/stylesheets/framework.scss

[ci skip]

CE upstream - 2018-05-02 09:27 UTC

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

EE-Port for Emoji Sprites Optimisation

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

Optimize Emoji Sprite Handling

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

Resolve "The `ee-specific-lines-check` should ignore files under `ee/`"

Closes #5856

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

Adding initial outline of pgbouncer documentation

Closes omnibus-gitlab#2649

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

Make ee/spec/features/admin/admin_sends_notification_spec.rb more reliable

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

Unify app/assets/javascripts/clusters/components/application_row.vue with CE

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

Revert "Merge branch '5480-sidebar-subscription-event-handling' into 'master'"

Closes #45979

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

Remove old GitLab Shell namespace actions implementations

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

Deprecation of ActionView's time_ago_in_words

Closes #45761

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

Increase new issue metadata form margin

Closes #44134

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

Save and expose only generic merge error

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

reliable

Merge branch '5841-geo-basesyncservice-should-prune-the-geo-temporary-directory-before-fetching' into 'master'

Resolve "Geo: BaseSyncService should prune the @geo-temporary directory before fetching"

Closes #5841

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

Skip master for EE-specific check

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

Merge branch '45970-broken-master-in-spec-features-issues-user_uses_slash_commands_spec-rb' into 'master'

Resolve "Broken master in spec/features/issues/user_uses_slash_commands_spec.rb"

Closes #45970

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

This reverts merge request !18682

* Add link to components in HA README
* Fix typo in pgbouncer page

Move WorkInProgress vue component

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

Move SidebarTimeTracking vue component

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

Move TimeTrackingNoTrackingPane vue component

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

master is a special case that CE master is not crafted toward
EE master, thus it could be ahead of EE master. In this case
we should compare with the merge-base, but that could make
the code unnecessarily complex and is not worth the effort.

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

Platform: Use component to emit event on Subscription toggle component instead of eventHub

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

Moves the calls to Gitaly, no matter what the feature flag values are.

Improve quick actions summary preview

Closes #45892

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

# Conflicts:
#	app/views/groups/_group_admin_settings.html.haml
#	spec/requests/api/runner_spec.rb

[ci skip]

Replace the `admin/emails.feature` spinach test with an rspec analog

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