From da533d725597c78af91ffaefdccbeb403574c008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kurk=C3=B3=20Mih=C3=A1ly?= Date: Tue, 9 Jan 2018 16:05:29 +0200 Subject: [PATCH] dashboard: fix linter issue --- dashboard/assets.go | 2 ++ dashboard/dashboard.go | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dashboard/assets.go b/dashboard/assets.go index d7ebce43eb..4c12696ae6 100644 --- a/dashboard/assets.go +++ b/dashboard/assets.go @@ -45,6 +45,7 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } +//nolint:misspell var _dashboardHtml = []byte(` @@ -85,6 +86,7 @@ func dashboardHtml() (*asset, error) { return a, nil } +//nolint:misspell var _bundleJs = []byte((((((((((`!function(modules) { function __webpack_require__(moduleId) { if (installedModules[moduleId]) return installedModules[moduleId].exports; diff --git a/dashboard/dashboard.go b/dashboard/dashboard.go index ab057ad429..2ac2652ee9 100644 --- a/dashboard/dashboard.go +++ b/dashboard/dashboard.go @@ -19,12 +19,8 @@ package dashboard //go:generate npm --prefix ./assets install //go:generate ./assets/node_modules/.bin/webpack --config ./assets/webpack.config.js --context ./assets //go:generate go-bindata -nometadata -o assets.go -prefix assets -nocompress -pkg dashboard assets/dashboard.html assets/bundle.js -<<<<<<< HEAD //go:generate sh -c "sed 's#var _bundleJs#//nolint:misspell\\\n&#' assets.go > assets.go.tmp && mv assets.go.tmp assets.go" //go:generate sh -c "sed 's#var _dashboardHtml#//nolint:misspell\\\n&#' assets.go > assets.go.tmp && mv assets.go.tmp assets.go" -======= -//go:generate sh -c "sed 's#var _public#//nolint:misspell\\\n&#' assets.go > assets.go.tmp && mv assets.go.tmp assets.go" ->>>>>>> dashboard: resolve asset path //go:generate gofmt -w -s assets.go import (