CE upstream - 2018-03-30 07:13 UTC

Closes omnibus-gitlab#3351

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

Order boards dropdown alphabetically

Closes #4916

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

CE upstream - 2018-03-29 12:26 UTC

Closes gitlab-com/infrastructure#3874, #3092, #5359, gitaly#1084, and gitlab-ce#43929

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

Revert "Merge branch 'sh-add-fsevents-dev-dependency' into 'master'"

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

This reverts merge request !17971

Catch errors in LoadBalancing::Host#online?

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

Prior to this commit it was possible for Host#online? to raise a
connection error when checking an already offline host. This could
happen because certain methods used for checking if a host is available
call the "connection" method, without catching any errors. As a result,
if this method raises then #online? would also raise. All of this could
lead to GitLab becoming unavailable depending on how many times it would
try to use this offline host.

To work around this we catch the errors that might be raised in
Host#online?. Unlike the code in LoadBalancing::LoadBalancer we don't
need to catch individual PG errors as we don't have to worry about
application errors. This means we only have to catch up to three errors:

1. ActionView::Template::Error (used inside views).

2. ActiveRecord::StatementInvalid (used basically everywhere outside of
   views).

3. PG::Error: used in some rare cases where Rails (for reasons unknown)
   doesn't wrap the original error.

Resolve "Remove disabled eslint rules from `spec/javascripts/pipelines/graph/linked_pipelines_mock_data.js`"

Closes #2690

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

Add note to troubleshoot pgbouncer failing to connect to pg due to missing auth cidr address

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

Merge two spec files issues_settings_spec.rb into one

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

Merge two board destroy service spec

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

Move cross_project_issuable_information_filter_spec.rb to ee dir

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

Renaming of "xlog" to "wal" for PostgreSQL 10

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

Fix documentation introduced in gitlab-org/gitlab-ce!17221

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

Adds Vuex store for security reports

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

Always display Labels section in issuable sidebar, even when the project has no labels

Closes #23472

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

Correctly fail Vuex action helper

Closes #44735

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

Update todos docs to say will trigger when commenting on a commit

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

Change Container to Kubernetes in Google integration docs

Closes #44685

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

Fix typo in issue closing pattern docs

Closes omnibus-gitlab#3351

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

Clarify what is meant by latest stable by linking to release posts

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