diff --git a/app/views/settings/applications/new.html.haml b/app/views/settings/applications/new.html.haml
index 5274a430c7..aa2281fea1 100644
--- a/app/views/settings/applications/new.html.haml
+++ b/app/views/settings/applications/new.html.haml
@@ -3,6 +3,6 @@
= simple_form_for @application, url: settings_applications_path do |f|
= render 'fields', f: f
-
+
.actions
= f.button :button, t('doorkeeper.applications.buttons.submit'), type: :submit
diff --git a/app/views/settings/applications/show.html.haml b/app/views/settings/applications/show.html.haml
index 12baed0881..390682d6f9 100644
--- a/app/views/settings/applications/show.html.haml
+++ b/app/views/settings/applications/show.html.haml
@@ -25,7 +25,7 @@
= simple_form_for @application, url: settings_application_path(@application), method: :put do |f|
= render 'fields', f: f
-
+
.actions
= f.button :button, t('generic.save_changes'), type: :submit
diff --git a/lib/mastodon/migration_helpers.rb b/lib/mastodon/migration_helpers.rb
index 80a8f440c3..2b5a6cd426 100644
--- a/lib/mastodon/migration_helpers.rb
+++ b/lib/mastodon/migration_helpers.rb
@@ -84,7 +84,7 @@ module Mastodon
BACKGROUND_MIGRATION_BATCH_SIZE = 1000 # Number of rows to process per job
BACKGROUND_MIGRATION_JOB_BUFFER_SIZE = 1000 # Number of jobs to bulk queue at a time
-
+
# Gets an estimated number of rows for a table
def estimate_rows_in_table(table_name)
exec_query('SELECT reltuples FROM pg_class WHERE relname = ' +
@@ -313,14 +313,14 @@ module Mastodon
end
table = Arel::Table.new(table_name)
-
+
total = estimate_rows_in_table(table_name).to_i
if total == 0
count_arel = table.project(Arel.star.count.as('count'))
count_arel = yield table, count_arel if block_given?
-
+
total = exec_query(count_arel.to_sql).to_hash.first['count'].to_i
-
+
return if total == 0
end
@@ -339,7 +339,7 @@ module Mastodon
# In case there are no rows but we didn't catch it in the estimated size:
return unless first_row
start_id = first_row['id'].to_i
-
+
say "Migrating #{table_name}.#{column} (~#{total.to_i} rows)"
started_time = Time.now
@@ -347,7 +347,7 @@ module Mastodon
migrated = 0
loop do
stop_row = nil
-
+
suppress_messages do
stop_arel = table.project(table[:id])
.where(table[:id].gteq(start_id))
@@ -373,29 +373,29 @@ module Mastodon
execute(update_arel.to_sql)
end
-
+
migrated += batch_size
if Time.now - last_time > 1
status = "Migrated #{migrated} rows"
-
+
percentage = 100.0 * migrated / total
status += " (~#{sprintf('%.2f', percentage)}%, "
-
+
remaining_time = (100.0 - percentage) * (Time.now - started_time) / percentage
-
+
status += "#{(remaining_time / 60).to_i}:"
status += sprintf('%02d', remaining_time.to_i % 60)
status += ' remaining, '
-
+
# Tell users not to interrupt if we're almost done.
if remaining_time > 10
status += 'safe to interrupt'
else
status += 'DO NOT interrupt'
end
-
+
status += ')'
-
+
say status, true
last_time = Time.now
end
@@ -483,7 +483,7 @@ module Mastodon
check_trigger_permissions!(table)
trigger_name = rename_trigger_name(table, old, new)
-
+
# If we were in the middle of update_column_in_batches, we should remove
# the old column and start over, as we have no idea where we were.
if column_for(table, new)
@@ -492,7 +492,7 @@ module Mastodon
else
remove_rename_triggers_for_mysql(trigger_name)
end
-
+
remove_column(table, new)
end
@@ -546,12 +546,12 @@ module Mastodon
temp_column = rename_column_name(column)
rename_column_concurrently(table, column, temp_column, type: new_type)
-
+
# Primary keys don't necessarily have an associated index.
if ActiveRecord::Base.get_primary_key(table) == column.to_s
old_pk_index_name = "index_#{table}_on_#{column}"
new_pk_index_name = "index_#{table}_on_#{column}_cm"
-
+
unless indexes_for(table, column).find{|i| i.name == old_pk_index_name}
add_concurrent_index(table, [temp_column], {
unique: true,
@@ -572,14 +572,14 @@ module Mastodon
# Wait for the indices to be built
indexes_for(table, column).each do |index|
expected_name = index.name + '_cm'
-
+
puts "Waiting for index #{expected_name}"
sleep 1 until indexes_for(table, temp_column).find {|i| i.name == expected_name }
end
-
+
was_primary = (ActiveRecord::Base.get_primary_key(table) == column.to_s)
old_default_fn = column_for(table, column).default_function
-
+
old_fks = []
if was_primary
# Get any foreign keys pointing at this column we need to recreate, and
@@ -613,7 +613,7 @@ module Mastodon
target_col: temp_column,
on_delete: extract_foreign_key_action(old_fk['on_delete'])
)
-
+
remove_foreign_key(old_fk['src_table'], name: old_fk['name'])
end
end
@@ -629,15 +629,15 @@ module Mastodon
transaction do
# This has to be performed in a transaction as otherwise we might have
# inconsistent data.
-
+
cleanup_concurrent_column_rename(table, column, temp_column)
rename_column(table, temp_column, column)
-
+
# If there was an old default function, we didn't copy it. Do that now
# in the transaction, so we don't miss anything.
change_column_default(table, column, -> { old_default_fn }) if old_default_fn
end
-
+
# Rename any indices back to what they should be.
indexes_for(table, column).each do |index|
next unless index.name.end_with?('_cm')
@@ -645,7 +645,7 @@ module Mastodon
real_index_name = index.name.sub(/_cm$/, '')
rename_index(table, index.name, real_index_name)
end
-
+
# Rename any foreign keys back to names based on the real column.
foreign_keys_for(table, column).each do |fk|
old_fk_name = concurrent_foreign_key_name(fk.from_table, temp_column, 'id')
@@ -653,7 +653,7 @@ module Mastodon
execute("ALTER TABLE #{fk.from_table} RENAME CONSTRAINT " +
"#{old_fk_name} TO #{new_fk_name}")
end
-
+
# Rename any foreign keys from other tables to names based on the real
# column.
old_fks.each do |old_fk|
@@ -664,7 +664,7 @@ module Mastodon
execute("ALTER TABLE #{old_fk['src_table']} RENAME CONSTRAINT " +
"#{old_fk_name} TO #{new_fk_name}")
end
-
+
# If the old column was a primary key, mark the new one as a primary key.
if was_primary
execute("ALTER TABLE #{table} ADD PRIMARY KEY USING INDEX " +
@@ -791,7 +791,7 @@ module Mastodon
# This is necessary as we can't properly rename indexes such as
# "ci_taggings_idx".
name = index.name + '_cm'
-
+
# If the order contained the old column, map it to the new one.
order = index.orders
if order.key?(old)
diff --git a/spec/controllers/settings/applications_controller_spec.rb b/spec/controllers/settings/applications_controller_spec.rb
index ca66f8d232..90e6a63d5c 100644
--- a/spec/controllers/settings/applications_controller_spec.rb
+++ b/spec/controllers/settings/applications_controller_spec.rb
@@ -2,10 +2,10 @@ require 'rails_helper'
describe Settings::ApplicationsController do
render_views
-
+
let!(:user) { Fabricate(:user) }
let!(:app) { Fabricate(:application, owner: user) }
-
+
before do
sign_in user, scope: :user
end
@@ -21,7 +21,7 @@ describe Settings::ApplicationsController do
end
end
-
+
describe 'GET #show' do
it 'returns http success' do
get :show, params: { id: app.id }
@@ -110,7 +110,7 @@ describe Settings::ApplicationsController do
end
end
end
-
+
describe 'PATCH #update' do
context 'success' do
let(:opts) {
@@ -131,7 +131,7 @@ describe Settings::ApplicationsController do
call_update
expect(app.reload.website).to eql(opts[:website])
end
-
+
it 'redirects back to applications page' do
expect(call_update).to redirect_to(settings_applications_path)
end
diff --git a/spec/fixtures/requests/attachment1.txt b/spec/fixtures/requests/attachment1.txt
index 77fd9c8361..30bd456bef 100644
Binary files a/spec/fixtures/requests/attachment1.txt and b/spec/fixtures/requests/attachment1.txt differ
diff --git a/spec/fixtures/requests/attachment2.txt b/spec/fixtures/requests/attachment2.txt
index 917a1d3987..2a252d2def 100644
Binary files a/spec/fixtures/requests/attachment2.txt and b/spec/fixtures/requests/attachment2.txt differ
diff --git a/spec/fixtures/requests/avatar.txt b/spec/fixtures/requests/avatar.txt
index d57b0984fb..d771f5dda2 100644
Binary files a/spec/fixtures/requests/avatar.txt and b/spec/fixtures/requests/avatar.txt differ
diff --git a/spec/fixtures/requests/idn.txt b/spec/fixtures/requests/idn.txt
index 3c76c59c05..5d07f2b796 100644
--- a/spec/fixtures/requests/idn.txt
+++ b/spec/fixtures/requests/idn.txt
@@ -6,7 +6,7 @@ Content-Length: 38111
Last-Modified: Wed, 20 Jul 2016 02:50:52 GMT
Connection: keep-alive
Accept-Ranges: bytes
-
+
@@ -21,16 +21,16 @@ Accept-Ranges: bytes
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
-
+
-
-
+
+
中国域名网站
-
+