summaryrefslogtreecommitdiff
path: root/.eslintignore
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2018-12-05 21:21:04 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2018-12-05 21:21:05 +0000
commit0d58744591245704f52d9030223bdb82f7dce714 (patch)
treec89e2cd880ed85928abf0dd8d8ebfa0207da936f /.eslintignore
parentcef19348ccf1026507937f20b1fbad8f4429e625 (diff)
parentcfe484795d4ddb8c7b3247802547e3da74c64cf2 (diff)
downloadgitlab-ce-0d58744591245704f52d9030223bdb82f7dce714.tar.gz
Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-12-05
# Conflicts: # app/assets/javascripts/diffs/store/actions.js # app/models/ci/pipeline.rb # app/serializers/issue_board_entity.rb # app/services/ci/create_pipeline_service.rb # app/views/admin/users/index.html.haml # doc/user/project/clusters/index.md # lib/gitlab/group_hierarchy.rb # lib/system_check/rake_task/app_task.rb # lib/system_check/rake_task/gitlab_task.rb # locale/gitlab.pot # spec/fixtures/api/schemas/entities/issue_boards.json # spec/models/project_spec.rb [ci skip]
Diffstat (limited to '.eslintignore')
-rw-r--r--.eslintignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.eslintignore b/.eslintignore
index 03eeeccf03f..e97c01da840 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -2,6 +2,7 @@
/config/
/builds/
/coverage/
+/coverage-frontend/
/coverage-javascript/
/node_modules/
/public/