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

Workaround for epic spec failure

Closes #4185

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

Extend Epics API - searching and sorting

Closes #4732

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

CE upstream - 2018-02-19 12:23 UTC

Closes #4972 and #4960

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

[EE] Fix `ee-files-location-check` job

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

Resolve "Count of users by role in admin"

Closes #4920

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

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

[Geo] Add logging when create a temporary repository

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

In API allow searching epics by title and description and sort
epics by created_at and updated_at attributes.

created_at and updated_at attributes are also exposed in epic API - if
we allow sorting by these attributes it also makes sense to include them
in API response.

Close #4732

Move ee-files-location-check to the test stage

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

Separate Disaster Recovery docs from Geo docs

Closes #1989

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

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

Resolve "Double closing system  notes when closing issue with Merge Request"

Closes #32546 and #32564

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

Don't attempt to update user tracked fields if database is in read-only

Closes gitlab-ee#4972

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

The tracking issue if this causes problems is
https://gitlab.com/gitlab-org/gitaly/issues/1028

[EE MR] Avoid slow File Lock checks when not used

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

Docs: Update all articles with the new layout (metadata from the frontmatter)

Closes #42831

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

Docs: Update all articles with the new layout (metadata from the frontmatter)

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

CE upstream - 2018-02-19 09:24 UTC

Closes #4825

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

Fix squash rebase not working when diff contained encoded data

Closes gitlab-ee#4960

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

[ci skip]

Also avoid double commit lookup during file lock check by reusing
memoized commits.

Backport webpack.config.js changes from EE

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

Fix Error 500 when viewing a commit with a GPG signature in Geo

Closes gitlab-ee#4825

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

Remember assignee when moving an issue

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

Sanitize extra blank spaces used when uploading a SSH key

Closes #40552

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

Closes gitlab-org/gitlab-ee#4825

When the applied diff contains UTF-8 or some other encoded data, the diff
returned back from the git process may be in ASCII-8BIT format. Writing this
data to stdin may fail if the data because stdin expects this data to be in
UTF-8. By switching the output to binmode, we ensure that the diff will
always be written as-is.

Closes gitlab-org/gitlab-ee#4960

For some reason when a certain set of specs are run together, the input to the
epic field gets stuck waiting for more text. Clicking the "Add" button only
causes it to get out of this state, but it doesn't actually submit the
request. By sending a keystroke before clicking the button, we appear to get
more consistent behavior.

Closes #4185

Related to #41949

CE upstream - 2018-02-18 06:29 UTC

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

With Geo, attempting to view an endpoint with a user could result in an
Error 500 since Devise attempts to update the last sign-in IP and other
details.

Closes gitlab-org/gitlab-ee#4972