Updated as best as possible, a lot of tests still change the store
and never reset the state back which can cause some issues with other
tests.

This moves away from storing in a single array just to render the table.
It now stores in a multi-dimensional array/object type where each entry
in the array can have its own tree. This makes storing the data for
future feature a little easier as there is only one way to store the
data.

Previously to insert a directory the code had to insert the directory
& then the file at the right point in the array. Now the directory
can be inserted anywhere & then a file can be quickly added into this
directory.

The rendering is still done with a single array, but this is handled
through underscore. Underscore takes the array & then goes through
each item to flatten it into one. It is done this way to save changing
the markup away from table, keeping it as a table keeps it semantically
correct.

Fix diff parser so it tolerates to diff special markers in the content

Closes #34431

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

Fix confusing double usage of 'metadata'

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

Popen with a timeout

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

Docs for Add "implements" to the default issue closing message regex

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

Backport a change in milestone_select from EE

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

Merge branch 'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-count' into 'master'

Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, instead of `Gcp::Cluster.count`

Closes #38960

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

Include a .hidden directory in pages artifact extraction tests

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

Move retry button to sidebar

Closes #27654

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

Update the settings api documentation

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

Remove global dropdown shortcut from help modal

Closes #39111

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

Remove shortcut JS classes from global namespace

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

added date parameter for time tracking

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

Update Vuex version

Closes #39096

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

Replaces 'WikiPage::CreateService' calls with 'wiki_page' factory

Closes #37571

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

Merge Merge Requests via Gitaly

Closes gitaly#654

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

Use grpc 1.6.6

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

We replace the usage of WikiPage::CreateService with the wiki_page factory in the specs.

Fixed server rendered flash not being removed on click

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

backport for gitlab-ee!2869

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

Use google-protobuf 3.4.1.1

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

Make "merge ongoing" check more consistent

Closes #39032

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

Refactor broadcast_message.js

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