mirror of
https://github.com/mastodon/mastodon.git
synced 2025-07-14 00:08:14 +00:00
Compare commits
No commits in common. "15f49eb8b44367bb39720790516a982b6a86286d" and "67e9e947bcfc49bf905a5cb562d78b26a729b185" have entirely different histories.
15f49eb8b4
...
67e9e947bc
|
@ -42,7 +42,7 @@ class StatusEdit < ApplicationRecord
|
||||||
default_scope { order(id: :asc) }
|
default_scope { order(id: :asc) }
|
||||||
|
|
||||||
delegate :local?, :application, :edited?, :edited_at,
|
delegate :local?, :application, :edited?, :edited_at,
|
||||||
:discarded?, :visibility, :language, to: :status
|
:discarded?, :visibility, to: :status
|
||||||
|
|
||||||
def emojis
|
def emojis
|
||||||
return @emojis if defined?(@emojis)
|
return @emojis if defined?(@emojis)
|
||||||
|
|
|
@ -226,6 +226,5 @@
|
||||||
"Capfile|Gemfile|*.{rb,ruby,ru,rake}": "bundle exec rubocop --force-exclusion -a",
|
"Capfile|Gemfile|*.{rb,ruby,ru,rake}": "bundle exec rubocop --force-exclusion -a",
|
||||||
"*.{js,jsx,ts,tsx}": "eslint --fix",
|
"*.{js,jsx,ts,tsx}": "eslint --fix",
|
||||||
"*.{css,scss}": "stylelint --fix"
|
"*.{css,scss}": "stylelint --fix"
|
||||||
},
|
}
|
||||||
"packageManager": "yarn@1.22.22"
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,11 +43,6 @@ describe Admin::StatusesController do
|
||||||
|
|
||||||
describe 'GET #show' do
|
describe 'GET #show' do
|
||||||
before do
|
before do
|
||||||
status.media_attachments << Fabricate(:media_attachment, type: :image, account: status.account)
|
|
||||||
status.save!
|
|
||||||
status.snapshot!(at_time: status.created_at, rate_limit: false)
|
|
||||||
status.update!(text: 'Hello, this is an edited post')
|
|
||||||
status.snapshot!(rate_limit: false)
|
|
||||||
get :show, params: { account_id: account.id, id: status.id }
|
get :show, params: { account_id: account.id, id: status.id }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user