bump commonmarker; rubocop
This commit is contained in:
parent
9faf46b0cf
commit
dff910dda6
|
@ -215,6 +215,8 @@ Style/MethodDefParentheses:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
Style/MultilineBlockChain:
|
Style/MultilineBlockChain:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
Style/MultilineMemoization:
|
||||||
|
Enabled: false
|
||||||
Style/MultilineTernaryOperator:
|
Style/MultilineTernaryOperator:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
Style/NegatedIf:
|
Style/NegatedIf:
|
||||||
|
|
2
Gemfile
2
Gemfile
|
@ -32,7 +32,7 @@ gem "rqrcode"
|
||||||
gem "pdf-reader"
|
gem "pdf-reader"
|
||||||
gem "nokogiri", ">= 1.13.2"
|
gem "nokogiri", ">= 1.13.2"
|
||||||
gem "htmlentities"
|
gem "htmlentities"
|
||||||
gem "commonmarker", "~> 0.14"
|
gem "commonmarker", ">= 0.23.4"
|
||||||
|
|
||||||
# perf
|
# perf
|
||||||
gem 'flamegraph'
|
gem 'flamegraph'
|
||||||
|
|
|
@ -82,7 +82,7 @@ GEM
|
||||||
regexp_parser (>= 1.5, < 3.0)
|
regexp_parser (>= 1.5, < 3.0)
|
||||||
xpath (~> 3.2)
|
xpath (~> 3.2)
|
||||||
chunky_png (1.4.0)
|
chunky_png (1.4.0)
|
||||||
commonmarker (0.23.2)
|
commonmarker (0.23.4)
|
||||||
concurrent-ruby (1.1.9)
|
concurrent-ruby (1.1.9)
|
||||||
crack (0.4.5)
|
crack (0.4.5)
|
||||||
rexml
|
rexml
|
||||||
|
@ -293,7 +293,7 @@ DEPENDENCIES
|
||||||
bcrypt (~> 3.1.2)
|
bcrypt (~> 3.1.2)
|
||||||
byebug
|
byebug
|
||||||
capybara
|
capybara
|
||||||
commonmarker (~> 0.14)
|
commonmarker (>= 0.23.4)
|
||||||
database_cleaner
|
database_cleaner
|
||||||
exception_notification
|
exception_notification
|
||||||
factory_bot_rails
|
factory_bot_rails
|
||||||
|
|
|
@ -23,13 +23,13 @@ class Message < ApplicationRecord
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
scope :inbox, -> (user) {
|
scope :inbox, ->(user) {
|
||||||
where(
|
where(
|
||||||
recipient: user,
|
recipient: user,
|
||||||
deleted_by_recipient: false,
|
deleted_by_recipient: false,
|
||||||
).preload(:author, :hat, :recipient).order('id asc')
|
).preload(:author, :hat, :recipient).order('id asc')
|
||||||
}
|
}
|
||||||
scope :outbox, -> (user) {
|
scope :outbox, ->(user) {
|
||||||
where(
|
where(
|
||||||
author: user,
|
author: user,
|
||||||
deleted_by_author: false,
|
deleted_by_author: false,
|
||||||
|
|
Loading…
Reference in New Issue