Skip to content

Commit 0b95b0e

Browse files
committed
Merge branch 'master' into prettier-1.7
* master: (34 commits) Revert "Make csslint complain about many more things" Revert "Only use ASCII characters in comments" Disable Emoji fear ✍ πŸ™Œ (no idea if those are going to work) mimic calendar's refreshing behavior in student-orgs Make csslint complain about many more things Revert "Remove trailing commas from actions" Disable trailing comma in literals (arrays) Add RuboCop as a development dependency Wrap contents of hash in spaces Collapse one-line if statement Only use ASCII characters in comments Use single quote instead of double quotes Add coding: utf-8 to some files Mark unused variables as unused Remove trailing commas from actions Disable symbol proc check Disable predicate method check rubocop: Ignore all paths in node_modules Disable documentation check Prefer single-quotes in Gemfile ...
2 parents 38cebe6 + db6f694 commit 0b95b0e

File tree

17 files changed

+188
-269
lines changed

17 files changed

+188
-269
lines changed

β€Ž.codeclimate.ymlβ€Ž

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ engines:
1111
- ruby
1212
- javascript
1313
- python
14-
- php
1514
eslint:
1615
enabled: true
1716
channel: "eslint-4"
@@ -21,6 +20,7 @@ engines:
2120
enabled: true
2221
rubocop:
2322
enabled: true
23+
2424
ratings:
2525
paths:
2626
- Gemfile.lock
@@ -32,5 +32,6 @@ ratings:
3232
- "**.php"
3333
- "**.py"
3434
- "**.rb"
35+
3536
exclude_paths:
3637
- node_modules/

0 commit comments

Comments
Β (0)