https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342/diffs#note_17039533

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342/diffs#note_17038749

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342/diffs#note_17039876

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342/diffs#note_17043090

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342#note_16956937

Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342#note_16132150

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342/diffs#note_16132555

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342#note_16118195

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342#note_16075554
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342#note_16075622

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342#note_16073734

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342#note_16074432

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342#note_15434860

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342/diffs#note_15434869

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6342#note_15434727

This reverts commit c5e0305d.

This reverts commit 1404aa86.

* upstream/master: (148 commits)
  Fix broken rspec in compare text
  Added logic to handle a revision input that does not exist in the menu
  Fix broken Spinach tests caused by changes in !6550
  Convert CHANGELOG to Markdown
  Fix active tab test for branches page
  Fix merge requests feature tests
  Wait for ajax call in merge request unsubscribe test
  Fix 500 error when creating mileston from group page
  Fix 404 when group path has dot in the name
  Add the tech writers usernames in the doc_sytleguide doc
  Fix broken SCSS linter errors due to missing newlines
  Fix Hash syntax to work for both Ruby 2.1 and 2.3
  Fix Spinach merge request diff failures
  remove ashley since she no longer works here
  Revert "Improve tabbing usability for sign in page"
  Don't use member properties in users_spec, and remove loading ref.
  Clean up stray Sign up ref.
  Back off the array spreading, bc poltergeist freaks out.
  Convert dispatcher to es6.
  Add exists to users routes and fix endpoint.
  ...

Fix broken rspec in compare text

!6910 changed the filter text from "Filter by branch/tag" to "Filter by Git revision"

See merge request !6926

!6910 changed the filter text from "Filter by branch/tag" to "Filter by Git revision"

Fix broken Spinach tests caused by changes in !6550

!6550 added dropdowns for the branch "from" and "to" fields, but these Spinach tests were not updated accordingly.

Partial fix to #23378

See merge request !6910

Partial fix to #23378

Fix active tab test for branches page

For https://gitlab.com/gitlab-org/gitlab-ce/issues/23378

See merge request !6923

Fix Spinach merge request diff failures

gitlab-git-test `master` was updated in ff076d88, and this caused the merge request diffs to change in a way that broke assumptions in the Spinach tests.
    
Partial fix to #23378

See merge request !6916

Convert CHANGELOG to Markdown

All this does is convert the version sections into headers. The list
items shouldn't really be indented by two spaces, but it makes no
difference to the rendering and this way we retain authorship history
for the actual changes.

Related to https://gitlab.com/gitlab-org/release-tools/merge_requests/29

[ci skip]

See merge request !6925

All this does is convert the version sections into headers. The list
items shouldn't really be indented by two spaces, but it makes no
difference to the rendering and this way we retain authorship history
for the actual changes.

Related to https://gitlab.com/gitlab-org/release-tools/merge_requests/29

Add the tech writers usernames in the doc_sytleguide doc

See merge request !6924

# Conflicts:
#   doc/development/doc_styleguide.md

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