* master: (28 commits)
  Merge branch '4984-broken-master-gitlab-git_access_wiki_spec' into 'master'
  fix broken specs
  remove common_d3 bundle
  remove graphs_show webpack bundle
  Chart.html.haml refactor (EE Version)
  Refactor and simplify the docs on 'include' for CI/CD
  [GH Import] Create an empty wiki if wiki import failed
  Resolve "group request membership mail with too long list of "To:""
  Fix a test that was hardcoding a documentation URL
  Add changelog entry
  Fix single digit value clipping
  Fix the ee-files-location-check job
  Extend Epics API - searching and sorting
  Increase feature flag cache TTL to one hour
  Convert Gitaly commit parent IDs to array as early as possible
  Clarify changelog for squash encoding fix
  Avoid slow File Lock checks when not used
  Fix squash rebase not working when diff contained encoded data
  Workaround for epic spec failure
  Don't attempt to update user tracked fields if database is in read-only
  ...

EE port of "Remove graphs_show.js webpack bundle"

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

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

Closes #4984, #4864, gitlab-qa#190, and gitlab-ce#40854

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

Resolve "Broken master: ee/spec/lib/gitlab/git_access_wiki_spec.rb and ee/spec/features/epics/epic_issues_spec.rb"

Closes #4984

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

Chart.html.haml refactor (EE Version)

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

Refactor and simplify the docs on 'include' for CI/CD

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

Resolve "Broken master: ee/spec/lib/gitlab/git_access_wiki_spec.rb and ee/spec/features/epics/epic_issues_spec.rb"

Closes #4984

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

Adds badge to show number of vulnerabilities

[GH Import] Create an empty wiki if wiki import failed

Closes #43020

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

Resolve "group request membership mail with too long list of "To:""

Closes #42274

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

Fix single digit value clipping for stacked progress bar

Closes gitlab-ee#4864

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

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

Avoid slow File Lock checks when not used

Closes #43339

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

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

Closes #4972 and #4960

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

Increase feature flag cache TTL to one hour

Closes #40854

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

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

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

* master: (102 commits)
  Refactor DR docs
  Remove unneeded images from old Geo docs
  Point to final doc location
  Use exec_query wrapper for ProjectAuthorization.roles_stats
  [Geo] Add logging when create a temporary repository
  Docs: Update all articles with the new layout (metadata from the frontmatter)
  Avoid slow File Lock checks when not used
  Fix Error 500 when viewing a commit with a GPG signature in Geo
  Remember assignee when moving an issue
  Add changelog entry
  Allow oxford commas and spaces before commas in MR issue closing pattern.
  Don't cache a nil repository root ref to prevent caching issues
  Merge branch '43345-spec-requests-api-project_import_spec-rb-fails' into 'master'
  Add back database changes for Ci::Build
  Revert "Merge branch 'expired-ci-artifacts' into 'master'"
  Fix order dependencies in some specs
  migrate admin:users:* to static bundle
  correct for missing break statement in dispatcher.js
  alias create and update actions to new and edit
  migrate projects:merge_requests:edit to static bundle
  ...

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>

Fix and simplify end-to-end tests for secret variables

Closes gitlab-qa#190

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

[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

Flipper already takes care of flushing cache entries when
enabling/disabling features so it should be safe to increase the TTL.
This in turn should drastically reduce the number of Flipper queries
executed.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/40854

Separate Disaster Recovery docs from Geo docs

Closes #1989

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