luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-21 14:23:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream

Browse source
This commit is contained in:
Claire 2023-08-24 21:50:14 +02:00
parent def58f8ac3 e3fd071973
commit 32e67e78a3
5 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -110,7 +110,7 @@ group :test do
gem 'fuubar', '~> 2.5' gem 'fuubar', '~> 2.5'
# Extra RSpec extenion methods and helpers for sidekiq # Extra RSpec extenion methods and helpers for sidekiq
gem 'rspec-sidekiq', '~> 3.1' gem 'rspec-sidekiq', '~> 4.0'
# Browser integration testing # Browser integration testing
gem 'capybara', '~> 3.39' gem 'capybara', '~> 3.39'

12
Gemfile.lock
View file

@ -633,10 +633,12 @@ GEM
rspec-expectations (~> 3.12) rspec-expectations (~> 3.12)
rspec-mocks (~> 3.12) rspec-mocks (~> 3.12)
rspec-support (~> 3.12) rspec-support (~> 3.12)
rspec-sidekiq (3.1.0) rspec-sidekiq (4.0.1)
rspec-core (~> 3.0, >= 3.0.0) rspec-core (~> 3.0)
sidekiq (>= 2.4.0) rspec-expectations (~> 3.0)
rspec-support (3.12.0) rspec-mocks (~> 3.0)
sidekiq (>= 5, < 8)
rspec-support (3.12.1)
rspec_chunked (0.6) rspec_chunked (0.6)
rubocop (1.56.1) rubocop (1.56.1)
base64 (~> 0.1.1) base64 (~> 0.1.1)
@ -911,7 +913,7 @@ DEPENDENCIES
redis-namespace (~> 1.10) redis-namespace (~> 1.10)
rqrcode (~> 2.2) rqrcode (~> 2.2)
rspec-rails (~> 6.0) rspec-rails (~> 6.0)
rspec-sidekiq (~> 3.1) rspec-sidekiq (~> 4.0)
rspec_chunked (~> 0.6) rspec_chunked (~> 0.6)
rubocop rubocop
rubocop-capybara rubocop-capybara

1
app/javascript/styles/mastodon/components.scss
View file

@ -5125,6 +5125,7 @@ a.status-card {
&.active { &.active {
transform: rotate(90deg); transform: rotate(90deg);
opacity: 1;
} }
&:hover { &:hover {

4
app/models/public_feed.rb
View file

@ -51,11 +51,11 @@ class PublicFeed
end end
def local_only? def local_only?
options[:local] options[:local] && !options[:remote]
end end
def remote_only? def remote_only?
options[:remote] options[:remote] && !options[:local]
end end
def account? def account?

7
spec/requests/api/v1/timelines/public_spec.rb
View file

@ -60,6 +60,13 @@ describe 'Public' do
it_behaves_like 'a successful request to the public timeline' it_behaves_like 'a successful request to the public timeline'
end end
context 'with local and remote params' do
let(:params) { { local: true, remote: true } }
let(:expected_statuses) { [local_status, remote_status, media_status] }
it_behaves_like 'a successful request to the public timeline'
end
context 'with only_media param' do context 'with only_media param' do
let(:params) { { only_media: true } } let(:params) { { only_media: true } }
let(:expected_statuses) { [media_status] } let(:expected_statuses) { [media_status] }