CE upstream - 2018-03-30 12:25 UTC

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

Remove duplicate entry for CI_PIPELINE_SOURCE

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

updating approval docs to clarify reset when target branch changes

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

Update jobs.md to download artifacts with curl using `-L`

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

remove duplicated string

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

Add doc section in HA Load Balancer to outline SSL options

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

Update no repository placeholder

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

Add gitlab-pages port number to artifacts links, if needed

Closes #44398

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

Update charlock_holmes to 0.76

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

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

Closes omnibus-gitlab#3351

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

Update dashboard milestones breadcrumb link

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

Didn't compile against newer icu4c versions and was fixed upstream in
https://github.com/brianmario/charlock_holmes/pull/129, which was
releaed in the versions its now locked to.

Document that LFS is included in the 10GB repository limit on gitlab.com

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

Remove support for absolute dirs from Git::Env

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

[Backport] Order boards dropdown alphabetically

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

Fix ee_compat_check for forks

Closes #40788

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

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