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

CE upstream - 2018-01-30 15:25 UTC

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

Improve UI in security reports

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

Include epics from subgroups

Closes #4301

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

Check MR state before submitting queries for discussion state

Closes #42236

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

Port changes from gitlab-org/gitlab-ee!4064 to CE

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

Add Geo attachment replication QA spec

Closes gitlab-qa#128

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

Don't run scripts/lint-changelog-yaml in scripts/static-analysis but only in the 'docs lint' job

Closes #42569

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

More $.ajax conversions to axios

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

Add `createNewItemFromValue` option and `clearDropdown` method to `create_item_dropdown` -- EE merge edition

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

Add `createNewItemFromValue` option and `clearDropdown` method to `create_item_dropdown`

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

When listing epics in a group, include also epics from all group's
subgroups. Also `by_iids` filter is removed from EpicsFinder because
filtering by iid (which is scoped to single group) doesn't make sense
since subgroups are included too.

Close #4301

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

CE upstream - 2018-01-30 11:56 UTC

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

Replace $.get in single file diff with axios

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

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

Replace $.post in label manager with axios

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

doc: Correct example responses in repository_files.md

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

Update index.md

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

Update neutral icon color

Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110

Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110

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

Fix grape-route-helper route shadowing

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

Resolve "Missing space between edit and delete buttons in tag list"

Closes #41802

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

[ci skip]

CE upstream - 2018-01-30 09:26 UTC

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

[ci skip]

[ci skip]

* master: (109 commits)
  Fix JIRA not working when a trailing slash is included
  Allow project to be set up to push to and pull from same mirror
  Remove tap and use simplified method call
  Remove tap and use simplified method call
  Replace $.post in edit blob with axios
  Resolve conflict in qa/qa/page/project/show.rb
  Add changelog entry
  Add test for `updateIssueOrder`
  Import mock data from file
  Mock data for related issues app
  Update issue order in store upon reorder success
  Fix an order dependency in a spec
  Close and do not reload MR diffs when source branch is deleted
  Don't allow Repository#log with limit zero
  Replace $.post in awards handler with axios
  Fix broken test
  Fix MR revert check when no merged_at is present
  Removed typo check for `unaproved` in sast:container report
  Disable MR check out button when source branch is deleted
  normalize headers correctly i18n flash message
  ...

Add noData empty state to Prometheus graphs

Closes #42558

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

CE upstream - 2018-01-30 06:24 UTC

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