summaryrefslogtreecommitdiff
path: root/spec/frontend_integration/test_helpers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-11-17 21:09:19 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-17 21:09:19 +0000
commit1b2e02ede90c238ec2dfc26f12bb71b904c2f2ff (patch)
tree7d3712bbbee4342e3061e6eccf492480741b0896 /spec/frontend_integration/test_helpers
parentc663374b3d4d91780d07dd825be74bfbee552f45 (diff)
downloadgitlab-ce-1b2e02ede90c238ec2dfc26f12bb71b904c2f2ff.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend_integration/test_helpers')
-rw-r--r--spec/frontend_integration/test_helpers/fixtures.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/frontend_integration/test_helpers/fixtures.js b/spec/frontend_integration/test_helpers/fixtures.js
index 5f9c0e8dcba..50fa4859dfa 100644
--- a/spec/frontend_integration/test_helpers/fixtures.js
+++ b/spec/frontend_integration/test_helpers/fixtures.js
@@ -1,4 +1,4 @@
-/* eslint-disable global-require */
+/* eslint-disable global-require, import/no-unresolved */
import { memoize } from 'lodash';
export const getProject = () => require('test_fixtures/api/projects/get.json');