Merge pull request #553 from ThibG/glitch-soc/merge-upstream

Merge upstream changes
This commit is contained in:
ThibG 2018-06-24 15:27:51 +02:00 committed by GitHub
commit c18d55e8c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 53 additions and 10 deletions

View File

@ -302,12 +302,10 @@
height: 0; height: 0;
transform-origin: bottom; transform-origin: bottom;
opacity: 0.0; opacity: 0.0;
transition: all 0.4s ease;
&.spoiler-input--visible { &.spoiler-input--visible {
height: 47px; height: 47px;
opacity: 1.0; opacity: 1.0;
transition: all 0.4s ease;
} }
} }
@ -568,6 +566,10 @@
} }
} }
.no-reduce-motion .spoiler-input {
transition: height 0.4s ease, opacity 0.4s ease;
}
.emojione { .emojione {
font-size: inherit; font-size: inherit;
vertical-align: middle; vertical-align: middle;

View File

@ -42,8 +42,9 @@ module Attachmentable
extensions_for_mime_type = mime_type.empty? ? [] : mime_type.first.extensions extensions_for_mime_type = mime_type.empty? ? [] : mime_type.first.extensions
original_extension = Paperclip::Interpolations.extension(attachment, :original) original_extension = Paperclip::Interpolations.extension(attachment, :original)
proper_extension = extensions_for_mime_type.first.to_s proper_extension = extensions_for_mime_type.first.to_s
proper_extension = 'jpeg' if proper_extension == 'jpe' extension = extensions_for_mime_type.include?(original_extension) ? original_extension : proper_extension
extension = 'jpeg' if extension == 'jpe'
extensions_for_mime_type.include?(original_extension) ? original_extension : proper_extension extension
end end
end end

View File

@ -4,8 +4,9 @@ class ImproveIndexOnStatusesForApiV1AccountsAccountIdStatuses < ActiveRecord::Mi
disable_ddl_transaction! disable_ddl_transaction!
def change def change
add_index :statuses, [:account_id, :id, :visibility], where: 'visibility IN (0, 1, 2)', algorithm: :concurrently # These changes ware reverted by migration 20180514140000.
add_index :statuses, [:account_id, :id], where: 'visibility = 3', algorithm: :concurrently # add_index :statuses, [:account_id, :id, :visibility], where: 'visibility IN (0, 1, 2)', algorithm: :concurrently
remove_index :statuses, column: [:account_id, :id, :visibility, :updated_at], order: { id: :desc }, algorithm: :concurrently, name: :index_statuses_20180106 # add_index :statuses, [:account_id, :id], where: 'visibility = 3', algorithm: :concurrently
# remove_index :statuses, column: [:account_id, :id, :visibility, :updated_at], order: { id: :desc }, algorithm: :concurrently, name: :index_statuses_20180106
end end
end end

View File

@ -5,10 +5,11 @@ class RevertIndexChangeOnStatusesForApiV1AccountsAccountIdStatuses < ActiveRecor
def change def change
safety_assured do safety_assured do
add_index :statuses, [:account_id, :id, :visibility, :updated_at], order: { id: :desc }, algorithm: :concurrently, name: :index_statuses_20180106 add_index :statuses, [:account_id, :id, :visibility, :updated_at], order: { id: :desc }, algorithm: :concurrently, name: :index_statuses_20180106 unless index_exists?(:statuses, name: "index_statuses_20180106")
end end
remove_index :statuses, column: [:account_id, :id, :visibility], where: 'visibility IN (0, 1, 2)', algorithm: :concurrently # These index may not exists (see migration 20180514130000)
remove_index :statuses, column: [:account_id, :id], where: 'visibility = 3', algorithm: :concurrently remove_index :statuses, column: [:account_id, :id, :visibility], where: 'visibility IN (0, 1, 2)', algorithm: :concurrently if index_exists?(:statuses, [:account_id, :id, :visibility], where: 'visibility IN (0, 1, 2)')
remove_index :statuses, column: [:account_id, :id], where: 'visibility = 3', algorithm: :concurrently if index_exists?(:statuses, ["account_id", "id"], where: "(visibility = 3)")
end end
end end

View File

@ -0,0 +1,38 @@
# frozen_string_literal: true
require 'rails_helper'
describe RemoteUnfollowsController do
render_views
describe '#create' do
subject { post :create, params: { acct: acct } }
let(:current_user) { Fabricate(:user, account: current_account) }
let(:current_account) { Fabricate(:account) }
let(:remote_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox')).account }
before do
sign_in current_user
current_account.follow!(remote_account)
stub_request(:post, 'http://example.com/inbox'){ { status: 200 } }
end
context 'when successfully unfollow remote account' do
let(:acct) {"acct:#{ remote_account.username }@#{ remote_account.domain }"}
it do
is_expected.to render_template :success
expect(current_account.following?(remote_account)).to be false
end
end
context 'when fails to unfollow remote account' do
let(:acct) {"acct:#{ remote_account.username + '_test' }@#{ remote_account.domain }"}
it do
is_expected.to render_template :error
expect(current_account.following?(remote_account)).to be true
end
end
end
end