Bump rubocop
This commit is contained in:
parent
156c7b8253
commit
a9bb673881
6 changed files with 13 additions and 15 deletions
|
|
@ -153,7 +153,7 @@ Style/Documentation:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|
||||||
# This is just silly. Calling the argument `other` in all cases makes no sense.
|
# This is just silly. Calling the argument `other` in all cases makes no sense.
|
||||||
Style/OpMethod:
|
Naming/BinaryOperatorParameterName:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|
||||||
# There are valid cases, for example debugging Cucumber steps,
|
# There are valid cases, for example debugging Cucumber steps,
|
||||||
|
|
|
||||||
2
Gemfile
2
Gemfile
|
|
@ -251,7 +251,7 @@ group :development do
|
||||||
gem "pronto-haml", "0.9.0", require: false
|
gem "pronto-haml", "0.9.0", require: false
|
||||||
gem "pronto-rubocop", "0.9.0", require: false
|
gem "pronto-rubocop", "0.9.0", require: false
|
||||||
gem "pronto-scss", "0.9.1", require: false
|
gem "pronto-scss", "0.9.1", require: false
|
||||||
gem "rubocop", "0.49.1", require: false
|
gem "rubocop", "0.50.0", require: false
|
||||||
|
|
||||||
# Preloading environment
|
# Preloading environment
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -607,15 +607,15 @@ GEM
|
||||||
rspec-mocks (~> 3.6.0)
|
rspec-mocks (~> 3.6.0)
|
||||||
rspec-support (~> 3.6.0)
|
rspec-support (~> 3.6.0)
|
||||||
rspec-support (3.6.0)
|
rspec-support (3.6.0)
|
||||||
rubocop (0.49.1)
|
rubocop (0.50.0)
|
||||||
parallel (~> 1.10)
|
parallel (~> 1.10)
|
||||||
parser (>= 2.3.3.1, < 3.0)
|
parser (>= 2.3.3.1, < 3.0)
|
||||||
powerpack (~> 0.1)
|
powerpack (~> 0.1)
|
||||||
rainbow (>= 1.99.1, < 3.0)
|
rainbow (>= 2.2.2, < 3.0)
|
||||||
ruby-progressbar (~> 1.7)
|
ruby-progressbar (~> 1.7)
|
||||||
unicode-display_width (~> 1.0, >= 1.0.1)
|
unicode-display_width (~> 1.0, >= 1.0.1)
|
||||||
ruby-oembed (0.12.0)
|
ruby-oembed (0.12.0)
|
||||||
ruby-progressbar (1.8.1)
|
ruby-progressbar (1.8.3)
|
||||||
ruby_dep (1.5.0)
|
ruby_dep (1.5.0)
|
||||||
rubyzip (1.2.1)
|
rubyzip (1.2.1)
|
||||||
rufus-scheduler (3.4.2)
|
rufus-scheduler (3.4.2)
|
||||||
|
|
@ -874,7 +874,7 @@ DEPENDENCIES
|
||||||
responders (= 2.4.0)
|
responders (= 2.4.0)
|
||||||
rspec-json_expectations (~> 2.1)
|
rspec-json_expectations (~> 2.1)
|
||||||
rspec-rails (= 3.6.1)
|
rspec-rails (= 3.6.1)
|
||||||
rubocop (= 0.49.1)
|
rubocop (= 0.50.0)
|
||||||
ruby-oembed (= 0.12.0)
|
ruby-oembed (= 0.12.0)
|
||||||
rubyzip (= 1.2.1)
|
rubyzip (= 1.2.1)
|
||||||
sass-rails (= 5.0.6)
|
sass-rails (= 5.0.6)
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ module NotificationMailers
|
||||||
class MentionedInComment < NotificationMailers::Base
|
class MentionedInComment < NotificationMailers::Base
|
||||||
attr_reader :comment
|
attr_reader :comment
|
||||||
|
|
||||||
def set_headers(target_id) # rubocop:disable Style/AccessorMethodName
|
def set_headers(target_id) # rubocop:disable Naming/AccessorMethodName
|
||||||
@comment = Mention.find_by_id(target_id).mentions_container
|
@comment = Mention.find_by_id(target_id).mentions_container
|
||||||
|
|
||||||
@headers[:in_reply_to] = @headers[:references] = "<#{@comment.parent.guid}@#{AppConfig.pod_uri.host}>"
|
@headers[:in_reply_to] = @headers[:references] = "<#{@comment.parent.guid}@#{AppConfig.pod_uri.host}>"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
module NotificationMailers
|
module NotificationMailers
|
||||||
class StartedSharing < NotificationMailers::Base
|
class StartedSharing < NotificationMailers::Base
|
||||||
def set_headers(*_args) # rubocop:disable Style/AccessorMethodName
|
def set_headers(*_args) # rubocop:disable Naming/AccessorMethodName
|
||||||
@headers[:subject] = I18n.t("notifier.started_sharing.subject", name: @sender.name)
|
@headers[:subject] = I18n.t("notifier.started_sharing.subject", name: @sender.name)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -3,11 +3,10 @@
|
||||||
namespace :generate do
|
namespace :generate do
|
||||||
desc 'Generates a Session Secret Token'
|
desc 'Generates a Session Secret Token'
|
||||||
task :secret_token do
|
task :secret_token do
|
||||||
|
path = Rails.root.join("config", "initializers", "secret_token.rb")
|
||||||
path = Rails.root.join('config', 'initializers', 'secret_token.rb')
|
|
||||||
secret = SecureRandom.hex(40)
|
secret = SecureRandom.hex(40)
|
||||||
File.open(path, 'w') do |f|
|
File.open(path, "w") do |f|
|
||||||
f.write <<"EOF"
|
f.write <<EOF
|
||||||
# Be sure to restart your server when you modify this file.
|
# Be sure to restart your server when you modify this file.
|
||||||
|
|
||||||
# Your secret key is used for verifying the integrity of signed cookies.
|
# Your secret key is used for verifying the integrity of signed cookies.
|
||||||
|
|
@ -21,7 +20,6 @@ namespace :generate do
|
||||||
# if you're sharing your code publicly.
|
# if you're sharing your code publicly.
|
||||||
Diaspora::Application.config.secret_key_base = '#{secret}'
|
Diaspora::Application.config.secret_key_base = '#{secret}'
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue