diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-06-28 15:53:12 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-06-28 15:53:12 +0800 |
commit | 35674fcd4732681286224c1c5fc92386ff53db7f (patch) | |
tree | 31585e8a89ebbf384bf9a9a61e9813331df8cdf7 /.eslintrc | |
parent | 07365e518330289149dd2135424c49fad19f401d (diff) | |
parent | 08ad0af49c017d740b43588c0809b3811d25a448 (diff) | |
download | gitlab-ce-35674fcd4732681286224c1c5fc92386ff53db7f.tar.gz |
Merge remote-tracking branch 'upstream/master' into 15041-Add-Custom-CI-Config-Path15041-Add-Custom-CI-Config-Path
* upstream/master: (12506 commits)
Update CHANGELOG.md for 9.3.2
Update architecture.md
Fix changelog entry file extension
Fix head pipeline stored in merge request for external pipelines
updated gitlab-ci.yml to compile locale
Ignore JSON files generated from PO files
Update mmap2 gem tha disables mmap_obj.gsub! as current implementation uses method that is no longer part of Ruby API
Disable rainbow during SimpleExecutor specs to have consistence
Slightly refactor pipeline schedules form in preparation for additions
Resolve "Submitting reply to existing diff discussion using Cmd/Ctrl+Enter submits twice and refreshes page"
Make the SimpleExecutor rescue exceptions in the executing Checks
Resolve "Unable to access edit comment from dropdown menu in certain screen sizes"
Update changelog item
revert removal of requestAnimationFrame and move to a separate MR/discussion
rename getEmojiCategoryMap and remove unnecessary parameter
Action Buttons on Prio Labels working again by setting pointer events to none on…
Remove 'contains' option from Commit.find_all
Remove Gitlab::Git::Repository#find_all
Use latest chrome and chrome driver in GitLab QA
Polish sidebar toggle
...
Diffstat (limited to '.eslintrc')
-rw-r--r-- | .eslintrc | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 00000000000..73cd7ecf66d --- /dev/null +++ b/.eslintrc @@ -0,0 +1,34 @@ +{ + "env": { + "jquery": true, + "browser": true, + "es6": true + }, + "extends": "airbnb-base", + "globals": { + "_": false, + "gl": false, + "gon": false, + "localStorage": false + }, + "plugins": [ + "filenames", + "import", + "html", + "promise" + ], + "settings": { + "html/html-extensions": [".html", ".html.raw", ".vue"], + "import/resolver": { + "webpack": { + "config": "./config/webpack.config.js" + } + } + }, + "rules": { + "filenames/match-regex": [2, "^[a-z0-9_]+$"], + "import/no-commonjs": "error", + "no-multiple-empty-lines": ["error", { "max": 1 }], + "promise/catch-or-return": "error" + } +} |