# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js
#	config/webpack.config.js
#	doc/api/namespaces.md
#	lib/gitlab/git_access.rb
#	lib/gitlab/ldap/config.rb

[ci skip]

CE upstream - 2018-02-14 15:38 UTC

Closes #4914

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

Remove a patch file that has no reason to be here

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

QA - Wait for create merge request button to appear

Closes gitlab-qa#177

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

Trim whitespace from input in the username/email form field

Closes #42637

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

Resolve "CSS in modal for DAST report is broken"

Closes #4944

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

Resolve "Document the instance level Auto DevOps domain option"

Closes #43231

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

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

EE port of pipeline-schedule-webpack

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

Converted pipeline_schedules bundles into automatic webpack entries

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

EE port of 42800-change-usage-of-avatar_icon

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

Resolve "HackerOne reported issue: Cookie bomb vulnerability in Pages"

Closes #31049

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

Added PlantUML server using docker

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

Update index.md with minor grammatical edit

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

Remove double negative

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

Fix Error 500s loading repositories with inconsistent HEAD

Closes #43268

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

Move spinach profile tests to RSpec

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

Resolve "CI status icon and avatar are not vertically aligned in MR list"

Closes #39607

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

This essentially allows to pass both user and email, so that we can
either prefer the user to retrieve the avatar or (if user is not
present) fall back to the email lookup.

Closes #42800.

Rather radical but avoids n+1 queries in the rather common case we want
to include information about the author.

We want to drop the generic #avatar_icon helper that supports both an email
and a user object being passed in. Instead, we want to explicitly use the #avatar_icon_for_user
and #avatar_icon_for_email helpers depending on what we have at hand.
This allows us to avoid unnecessary database queries (e.g. call
User.find_by_any_email if we already have the user).

In situations like here, this makes it less convenient to use.

We need to keep the email lookup as we want to fall back to displaying
the gravatar result for a given email if the user does not exist.

Whenever we already deal with a User object, let's use the more specific
method avatar_icon_for_user.