Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update gems #338

Merged
merged 11 commits into from
Jan 4, 2017
Merged

Update gems #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5e24052
Update gems
tsujigiri Dec 26, 2016
ef75a7b
Disable Rails/HttpPositionalArguments
tsujigiri Dec 27, 2016
0e23ed9
Add frozen string literal pragma to all files
tsujigiri Dec 27, 2016
dfcfd84
Remove unnecessary require
tsujigiri Dec 27, 2016
0ce0e3b
Address another Rubocop complaint
tsujigiri Dec 27, 2016
1fa4390
Fix test failing on CI
tsujigiri Dec 27, 2016
f7ece06
Add tasks for running Rubocop
tsujigiri Dec 27, 2016
b8f66fa
Address Rubocop complaints
tsujigiri Dec 27, 2016
c642656
Add missing frozen string literal pragma
tsujigiri Dec 27, 2016
bfbc625
This is not the fix you are looking for 👋
tsujigiri Dec 27, 2016
82cf45d
Update .env.example
tsujigiri Dec 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions .env.example
View file
Open in desktop
Expand Up @@ -12,9 +12,8 @@ export REDIS_URL=redis://localhost
export FITBIT_CONSUMER_KEY=foo
export FITBIT_CONSUMER_SECRET=bar
export PLOS_API_KEY=foo
export RECAPTCHA_PRIVATE_KEY=6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe
export RECAPTCHA_PUBLIC_KEY=6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI
export SIDEKIQ_PASSWORD=foo
export RECAPTCHA_SECRET_KEY=6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe
export RECAPTCHA_SITE_KEY=6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI
export MENDELEY_CONSUMER_KEY=foo
export ERRBIT_API_KEY=foo
export ERRBIT_HOST=localhost
Expand Down
17 changes: 8 additions & 9 deletions .rubocop.yml
View file
Open in desktop
@@ -1,5 +1,3 @@
inherit_from: .rubocop_todo.yml

Rails:
Enabled: true

Expand All @@ -12,17 +10,18 @@ Style/StringLiterals:
Style/Documentation:
Enabled: false

#Metrics/LineLength:
# Max: 100

Style/IfUnlessModifier:
Enabled: false

Style/TrailingCommaInLiteral:
Enabled: false

#Metrics/MethodLength:
# Max: 20
# Only relevant for Rails 5.
Rails/HttpPositionalArguments:
Enabled: false

Style/FrozenStringLiteralComment:
EnforcedStyle: always

#Metrics/AbcSize:
# Max: 20
Metrics/LineLength:
Max: 100