nocebo/diaspora_federation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump rubocop

Browse source
This commit is contained in:
Benjamin Neff 2016-07-13 00:47:19 +02:00
parent c25196c2a4
commit be7264b604
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.rubocop.yml
View file

@ -50,7 +50,7 @@ Style/HashSyntax:
EnforcedStyle: ruby19_no_mixed_keys EnforcedStyle: ruby19_no_mixed_keys
# has_key? and has_value? are far more readable than key? and value? # has_key? and has_value? are far more readable than key? and value?
Style/DeprecatedHashMethods: Style/PreferredHashMethods:
Enabled: false Enabled: false
# String#% is by far the least verbose and only object oriented variant. # String#% is by far the least verbose and only object oriented variant.

2
Gemfile
View file

@ -17,7 +17,7 @@ end
group :development do group :development do
# code style # code style
gem "rubocop", "0.40.0" gem "rubocop", "0.41.2"
gem "pronto", "0.6.0" gem "pronto", "0.6.0"
gem "pronto-rubocop", "0.6.2", require: false gem "pronto-rubocop", "0.6.2", require: false

6
Gemfile.lock
View file

@ -224,8 +224,8 @@ GEM
rspec-mocks (~> 3.5.0) rspec-mocks (~> 3.5.0)
rspec-support (~> 3.5.0) rspec-support (~> 3.5.0)
rspec-support (3.5.0) rspec-support (3.5.0)
rubocop (0.40.0) rubocop (0.41.2)
parser (>= 2.3.1.0, < 3.0) parser (>= 2.3.1.1, < 3.0)
powerpack (~> 0.1) powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0) rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
@ -300,7 +300,7 @@ DEPENDENCIES
rspec-collection_matchers (~> 1.1.2) rspec-collection_matchers (~> 1.1.2)
rspec-core (~> 3.5.1) rspec-core (~> 3.5.1)
rspec-rails (~> 3.5.1) rspec-rails (~> 3.5.1)
rubocop (= 0.40.0) rubocop (= 0.41.2)
simplecov (= 0.12.0) simplecov (= 0.12.0)
simplecov-rcov (= 0.2.3) simplecov-rcov (= 0.2.3)
spring spring

2
app/controllers/diaspora_federation/h_card_controller.rb
View file

@ -13,7 +13,9 @@ module DiasporaFederation
render nothing: true, status: 404 render nothing: true, status: 404
else else
logger.info "hcard profile request for: #{person_hcard.nickname}:#{person_hcard.guid}" logger.info "hcard profile request for: #{person_hcard.nickname}:#{person_hcard.guid}"
# rubocop:disable Rails/OutputSafety
render html: person_hcard.to_html.html_safe render html: person_hcard.to_html.html_safe
# rubocop:enable Rails/OutputSafety
end end
end end
end end