Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17525

Make it clearer that /licenses is the OS license templates endpoint

Following the discussion on https://gitlab.com/gitlab-org/gitlab-ce/commit/13804aba867d19009ca94d820aa7ec650a509f5a#note_4961954.

Corresponding CE MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4188

See merge request !407

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

Merge CE 73ead4 to EE



See merge request !403

ES upgrade docs

See merge request !393

Instrument all Grape API helpers

This has been added to help us figure out what's making certain Grape API calls slow (e.g. the one used for authorized keys as described in gitlab-com/operations#99).

See merge request !4169

Bump gitlab-elastic-git

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/378

See merge request !343

Fix left sidebar overlap when scroll on long menu

Fixes #17566. Caused by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4139. Smaller fix compared to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4164

cc @iamphill @jschatz1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !4165

CE upstream



See merge request !402

Toggle email signup confirmation in admin settings

Implements toggling verification email #14684

See merge request !3862

Add an Event's target's title to its reference link

Given an activity feed entry like:

> Douwe Maan commented on [issue #123] at [gitlab-org/gitlab-ce]

...the `issue #123` link will now have a `title` attribute.

Plus some minor refactorings, see individual commits for details.

See merge request !4090

Disallow search engines from indexing uploads from a GitLab project.

This can sometimes include sensitive information from private projects and confidential issues. It shouldn't be indexed. Resolves #15551.

cc: @DouweM 

See merge request !4167

Use the relative url prefix for links in Wiki

Retry of gitlab-org/gitlab-ce!4026

@rymai !4050 solved all other problems how it looks like. I [tested](https://gitlab.com/artem-forks/gitlab-ce/commit/ff01eca7b559efa7cacf3412aa01cd8ae8a6db7e/builds) this with ruby22

Fixes #17071 



See merge request !4131

Add tests for unintentional filtering bug in MR

!3872 has a lack of tests for Merge Requests while !3872 has only ones for Issues.

This MR has complementary tests for MR list.

See merge request !4154

This can sometimes include sensitive information from private projects and confidential issues. It shouldn't be indexed. Resolves #15551.

Remove unused methods from Event model

These get escaped automatically.

Prior, the `title` attribute was being included as an argument to the
route helper rather than as an argument to `link_to`.

Given an activity feed entry like:

> Douwe Maan commented on [issue #123] at [gitlab-org/gitlab-ce]

...the `issue #123` link will now have a `title` attribute.

Merge branch '17227-upcoming-milestone-is-confusing-when-projects-have-different-milestones' into 'master'

Make upcoming milestone work across projects

Before: we took the next milestone due across all projects in the
search and found issues whose milestone title matched that
one. Problems:

1. The milestone could be closed.
2. Different projects have milestones with different schedules.
3. Different projects have milestones with different titles.
4. Different projects can have milestones with different schedules, but
   the _same_ title. That means we could show issues from a past
   milestone, or one that's far in the future.

After: gather the ID of the next milestone on each project we're looking
at, and find issues with those milestone IDs. Problems:

1. For a lot of projects, this can return a lot of IDs.
2. The SQL query has to be different between Postgres and MySQL, because
   MySQL is much more lenient with HAVING: as well as the columns
   appearing in GROUP BY or in aggregate clauses, MySQL allows them to
   appear in the SELECT list (un-aggregated).

Closes #17227.

See merge request !4125

Merge branch '13691-allow-admin-to-reset-user-password-and-force-password-reset-on-next-login' into 'master'

Force password change after admin reset

Closes #13691.

See merge request !4016

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Added authentication service for docker registry

This adds a simple authentication service for docker which uses current user credentials to authenticate pulls and pushes.

I have only one concern. Since the `.docker/config` is unencrypted, thus the password for user stored there is unencrypted, maybe we should from the start implement function to generate/provide a separate password just for the purposes of accessing docker registry?

What do you think @jacobvosmaer @sytses @marin?

cc @marin 

See merge request !3787

Updated git hooks UI

![Screen_Shot_2016-04-27_at_15.01.52](/uploads/d2487613961f3dd8258e74f8ef8fbf38/Screen_Shot_2016-04-27_at_15.01.52.png)

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13994

See merge request !360

Postgres only needs to select a single column, so that can used as a
sub-query where `Milestone.upcoming_ids_by_projects` is actually used in
`IssuableFinder`.

MySQL needs to select the `due_date` column because it's used in the
`HAVING` clause, so it has to return an array of IDs.