Merge branch 'master' into glitch-soc/merge-upstream

This commit is contained in:
Thibaut Girka 2018-10-27 18:54:26 +02:00
commit c13cfeac09
6 changed files with 40 additions and 5 deletions

View File

@ -9,7 +9,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController
before_action :set_pack before_action :set_pack
before_action :set_sessions, only: [:edit, :update] before_action :set_sessions, only: [:edit, :update]
before_action :set_instance_presenter, only: [:new, :create, :update] before_action :set_instance_presenter, only: [:new, :create, :update]
before_action :set_body_classes, only: [:new, :create] before_action :set_body_classes, only: [:new, :create, :edit, :update]
def destroy def destroy
not_found not_found
@ -86,7 +86,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController
end end
def set_body_classes def set_body_classes
@body_classes = 'lighter' @body_classes = %w(edit update).include?(action_name) ? 'admin' : 'lighter'
end end
def set_invite def set_invite

View File

@ -352,4 +352,22 @@ body.rtl {
margin-right: 15px; margin-right: 15px;
text-align: right; text-align: right;
} }
.fa-chevron-left::before {
content: "\F054";
}
.fa-chevron-right::before {
content: "\F053";
}
.column-back-button__icon {
margin-right: 0;
margin-left: 5px;
}
.column-header__setting-arrows .column-header__setting-btn:last-child {
padding-left: 0;
padding-right: 10px;
}
} }

View File

@ -129,7 +129,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
return if tag['name'].blank? return if tag['name'].blank?
hashtag = tag['name'].gsub(/\A#/, '').mb_chars.downcase hashtag = tag['name'].gsub(/\A#/, '').mb_chars.downcase
hashtag = Tag.where(name: hashtag).first_or_create(name: hashtag) hashtag = Tag.where(name: hashtag).first_or_create!(name: hashtag)
return if @tags.include?(hashtag) return if @tags.include?(hashtag)

View File

@ -5,9 +5,10 @@ class ActivityPub::FetchRemoteAccountService < BaseService
SUPPORTED_TYPES = %w(Application Group Organization Person Service).freeze SUPPORTED_TYPES = %w(Application Group Organization Person Service).freeze
# Should be called when uri has already been checked for locality
# Does a WebFinger roundtrip on each call # Does a WebFinger roundtrip on each call
def call(uri, id: true, prefetched_body: nil, break_on_redirect: false) def call(uri, id: true, prefetched_body: nil, break_on_redirect: false)
return ActivityPub::TagManager.instance.uri_to_resource(uri, Account) if ActivityPub::TagManager.instance.local_uri?(uri)
@json = if prefetched_body.nil? @json = if prefetched_body.nil?
fetch_resource(uri, id) fetch_resource(uri, id)
else else

View File

@ -0,0 +1,16 @@
class RemoveFauxRemoteAccountDuplicates < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
def up
local_domain = Rails.configuration.x.local_domain
# Just a safety measure to ensure that under no circumstance
# we will query `domain IS NULL` because that would return
# actually local accounts, the originals
return if local_domain.nil?
Account.where(domain: local_domain).in_batches.destroy_all
end
def down; end
end

View File

@ -10,7 +10,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2018_10_24_224956) do ActiveRecord::Schema.define(version: 2018_10_26_034033) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"