summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-08-16 12:31:47 +0000
committerTim Zallmann <tzallmann@gitlab.com>2017-08-16 12:31:47 +0000
commitee4528526e1bbf58f256c0fcc27873fcdf80daa4 (patch)
treeaf07e1f0d30477c6b1ed5dab5bf411b417db2d49 /app/helpers
parent1998a4a10796a277b3e587e61a8299ce981c92d2 (diff)
parent554afea059446384783f3c68c09ac56afa0e7d49 (diff)
downloadgitlab-ce-ee4528526e1bbf58f256c0fcc27873fcdf80daa4.tar.gz
Merge branch 'dispatcher-race-condition-fix' into 'master'
Fix race condition with dispatcher.js See merge request !13377
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/version_check_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/version_check_helper.rb b/app/helpers/version_check_helper.rb
index 3b175251446..456598b4c28 100644
--- a/app/helpers/version_check_helper.rb
+++ b/app/helpers/version_check_helper.rb
@@ -2,7 +2,7 @@ module VersionCheckHelper
def version_status_badge
if Rails.env.production? && current_application_settings.version_check_enabled
image_url = VersionCheck.new.url
- image_tag image_url, class: 'js-version-status-badge', lazy: false
+ image_tag image_url, class: 'js-version-status-badge'
end
end
end