diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-28 18:45:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-28 18:45:28 +0100 |
| commit | fad29fd23052cdf3d51a6e0eb03557554572d402 (patch) | |
| tree | 4ba415e02d601654867889da11391b509909635d /.rubocop.yml | |
| parent | bb316faffff7a76bc89f7e942233f0e14caf60f5 (diff) | |
| parent | ce7d055d3cc7927a597c8bb56b45f8e0aae91319 (diff) | |
Merge pull request #973 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to '.rubocop.yml')
| -rw-r--r-- | .rubocop.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 59e8a757a..f1095e022 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -80,7 +80,7 @@ Rails/HttpStatus: Rails/Exit: Exclude: - 'lib/mastodon/*' - - 'lib/cli' + - 'lib/cli.rb' Style/ClassAndModuleChildren: Enabled: false |