diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 15:09:45 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 15:09:45 +0000 |
commit | aaf59610548d9b0fd01acfd50e831cbe519ecba2 (patch) | |
tree | b6505abedcd965ebae5118b504b185b63129dc4c /app/assets/javascripts/main.js | |
parent | 1363ca12f1f07c634647cf55c4c16b7401098673 (diff) | |
download | gitlab-ce-aaf59610548d9b0fd01acfd50e831cbe519ecba2.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/main.js')
-rw-r--r-- | app/assets/javascripts/main.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 4d3a61a7627..81b2e9f13a5 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -49,7 +49,7 @@ window.$ = jQuery; // Add nonce to jQuery script handler jQuery.ajaxSetup({ converters: { - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings, func-names + // eslint-disable-next-line @gitlab/require-i18n-strings, func-names 'text script': function(text) { jQuery.globalEval(text, { nonce: getCspNonceValue() }); return text; |