Add Gitlab::Git::Env.to_env_hash

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

update postgresql requirements

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

Resolve "Remove "Build failed" TODO if it has been auto-retried"

Closes #38236

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

Fix alignment for indeterminate marker in dropdowns

Closes #38963

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

Conflict resolution refactor

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

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

Closes #34431

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

When a build is retried automatically, we close any open todos. However, we do
that _before_ creating a new build failed todo.

To solve this, we check if the build is retried before creating the todo. We
also ensure that the build _instance_ has the correct attribute set, without
needing to reload it from the database.

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

[skip ci]

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