diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-06-07 05:13:49 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-06-07 05:13:49 -0500 |
| commit | 8142bd2553e7819722fdfc401e06cb10eeddd230 (patch) | |
| tree | d771e65a58d3c69ba1c08c3fc145f24b5b806274 /.codeclimate.yml | |
| parent | f8d50a40701f344ea7c2a0e5475bbcbc727ef930 (diff) | |
| parent | 2304d52599bfd3a907931971a94b9b68f229ab0a (diff) | |
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
Conflicts: app/models/status.rb The conflict in the Status model was due to https://github.com/tootsuite/mastodon/commit/5bf500338478f819a65d25636a0af61a482972d3. It was resolved by accepting tootsuite's changes.
Diffstat (limited to '.codeclimate.yml')
| -rw-r--r-- | .codeclimate.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.codeclimate.yml b/.codeclimate.yml index 21e6b33bf..58f6b3de4 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -30,6 +30,7 @@ plugins: channel: eslint-4 rubocop: enabled: true + channel: rubocop-0-54 scss-lint: enabled: true exclude_patterns: |