mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-03 17:56:26 +01:00
Code Issues Projects Releases Wiki Activity

Update dependencies for Ruby (2018-04-23) (#7237)

Browse Source 
* Update annotate to version 2.7.3

* Update aws-sdk-s3 to version 1.9.2

* Update browser to version 2.5.3

* Update capistrano to version 3.10.2

* Update domain_name to version 0.5.20180417

* Update http to version 3.2.0

* Update lograge to version 0.10.0

* Update oj to version 3.5.1

* Update parallel_tests to version 2.21.3

* Update puma to version 3.11.4

* Update rubocop to version 0.55.0

* Update scss_lint to version 0.57.0

* Update simplecov to version 0.16.1

* Update tty-command to version 0.8.0

* Update tty-prompt to version 0.16.0

* Update pkg-config to version 1.3.0

* Update fog-local to version 0.5.0

* Update fog-openstack to version 0.1.25

* Update devise-two-factor to version 3.0.3

* bundle update
This commit is contained in:
Yamagishi Kazutoshi 2018-04-23 18:29:17 +09:00 committed by Eugen Rochko
parent 7db7d68136
commit 9613a53cb3
39 changed files with 173 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Gemfile
View File

@ -3,7 +3,7 @@
source 'https://rubygems.org'
ruby '>= 2.3.0', '< 2.6.0'
gem 'pkg-config', '~> 1.2'
gem 'pkg-config', '~> 1.3'
gem 'puma', '~> 3.11'
gem 'rails', '~> 5.2.0'
@ -11,11 +11,11 @@ gem 'rails', '~> 5.2.0'
gem 'hamlit-rails', '~> 0.2'
gem 'pg', '~> 1.0'
gem 'pghero', '~> 2.1'
gem 'dotenv-rails', '~> 2.2'
gem 'dotenv-rails', '~> 2.2', '< 2.3'
gem 'aws-sdk-s3', '~> 1.8', require: false
gem 'aws-sdk-s3', '~> 1.9', require: false
gem 'fog-core', '~> 1.45'
gem 'fog-local', '~> 0.4', require: false
gem 'fog-local', '~> 0.5', require: false
gem 'fog-openstack', '~> 0.1', require: false
gem 'paperclip', '~> 6.0'
gem 'paperclip-av-transcoder', '~> 0.6'
@ -30,7 +30,7 @@ gem 'iso-639'
gem 'chewy', '~> 5.0'
gem 'cld3', '~> 3.2.0'
gem 'devise', '~> 4.4'
gem 'devise-two-factor', '~> 3.0', git: 'https://github.com/ykzts/devise-two-factor.git', branch: 'rails-5.2'
gem 'devise-two-factor', '~> 3.0'
group :pam_authentication, optional: true do
gem 'devise_pam_authenticatable2', '~> 9.1'
@ -48,7 +48,7 @@ gem 'goldfinger', '~> 2.1'
gem 'hiredis', '~> 0.6'
gem 'redis-namespace', '~> 1.5'
gem 'htmlentities', '~> 4.3'
gem 'http', '~> 3.0'
gem 'http', '~> 3.2'
gem 'http_accept_language', '~> 2.1'
gem 'httplog', '~> 1.0'
gem 'idn-ruby', require: 'idn'
@ -57,9 +57,9 @@ gem 'link_header', '~> 0.0'
gem 'mime-types', '~> 3.1'
gem 'nokogiri', '~> 1.8'
gem 'nsa', '~> 0.2'
gem 'oj', '~> 3.4'
gem 'oj', '~> 3.5'
gem 'ostatus2', '~> 2.0'
gem 'ox', '~> 2.8'
gem 'ox', '~> 2.9'
gem 'pundit', '~> 1.1'
gem 'premailer-rails'
gem 'rack-attack', '~> 5.2'
@ -82,8 +82,8 @@ gem 'simple_form', '~> 4.0'
gem 'sprockets-rails', '~> 3.2', require: 'sprockets/railtie'
gem 'stoplight', '~> 2.1.3'
gem 'strong_migrations', '~> 0.2'
gem 'tty-command'
gem 'tty-prompt'
gem 'tty-command', '~> 0.8'
gem 'tty-prompt', '~> 0.16'
gem 'twitter-text', '~> 1.14'
gem 'tzinfo-data', '~> 1.2018'
gem 'webpacker', '~> 3.4'
@ -112,7 +112,7 @@ group :test do
gem 'rails-controller-testing', '~> 1.0'
gem 'rspec-sidekiq', '~> 3.0'
gem 'rspec-retry', '~> 0.5', require: false
gem 'simplecov', '~> 0.14', require: false
gem 'simplecov', '~> 0.16', require: false
gem 'webmock', '~> 3.3'
gem 'parallel_tests', '~> 2.21'
end
@ -126,10 +126,10 @@ group :development do
gem 'letter_opener', '~> 1.4'
gem 'letter_opener_web', '~> 1.3'
gem 'memory_profiler'
gem 'rubocop', require: false
gem 'rubocop', '~> 0.55', require: false
gem 'brakeman', '~> 4.2', require: false
gem 'bundler-audit', '~> 0.6', require: false
gem 'scss_lint', '~> 0.55', require: false
gem 'scss_lint', '~> 0.57', require: false
gem 'capistrano', '~> 3.10'
gem 'capistrano-rails', '~> 1.3'
@ -138,6 +138,6 @@ group :development do
end
group :production do
gem 'lograge', '~> 0.9'
gem 'lograge', '~> 0.10'
gem 'redis-rails', '~> 5.0'
end

136
Gemfile.lock
View File

@ -1,15 +1,3 @@
GIT
remote: https://github.com/ykzts/devise-two-factor.git
revision: f60492b29c174d4c959ac02406392f8eb9c4d374
branch: rails-5.2
specs:
devise-two-factor (3.0.2)
activesupport (< 5.3)
attr_encrypted (>= 1.3, < 4, != 2)
devise (~> 4.0)
railties (< 5.3)
rotp (~> 2.0)
GEM
remote: https://rubygems.org/
specs:
@ -64,7 +52,7 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
airbrussh (1.3.0)
sshkit (>= 1.6.1, != 1.7.0)
annotate (2.7.2)
annotate (2.7.3)
activerecord (>= 3.2, < 6.0)
rake (>= 10.4, < 13.0)
arel (9.0.0)
@ -73,15 +61,15 @@ GEM
encryptor (~> 3.0.0)
av (0.9.0)
cocaine (~> 0.5.3)
aws-partitions (1.70.0)
aws-sdk-core (3.17.0)
aws-partitions (1.80.0)
aws-sdk-core (3.19.0)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-kms (1.5.0)
aws-sdk-core (~> 3)
aws-sigv4 (~> 1.0)
aws-sdk-s3 (1.8.2)
aws-sdk-s3 (1.9.1)
aws-sdk-core (~> 3)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.0)
@ -96,7 +84,7 @@ GEM
bootsnap (1.3.0)
msgpack (~> 1.0)
brakeman (4.2.1)
browser (2.5.2)
browser (2.5.3)
builder (3.2.3)
bullet (5.7.5)
activesupport (>= 3.0.0)
@ -104,7 +92,7 @@ GEM
bundler-audit (0.6.0)
bundler (~> 1.2)
thor (~> 0.18)
capistrano (3.10.1)
capistrano (3.10.2)
airbrussh (>= 1.0.0)
i18n
rake (>= 10.0.0)
@ -156,12 +144,18 @@ GEM
railties (>= 4.1.0, < 6.0)
responders
warden (~> 1.2.3)
devise-two-factor (3.0.3)
activesupport (< 5.3)
attr_encrypted (>= 1.3, < 4, != 2)
devise (~> 4.0)
railties (< 5.3)
rotp (~> 2.0)
devise_pam_authenticatable2 (9.1.0)
devise (>= 4.0.0)
rpam2 (~> 4.0)
diff-lcs (1.3)
docile (1.1.5)
domain_name (0.5.20170404)
docile (1.3.0)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
doorkeeper (4.3.2)
railties (>= 4.2)
@ -172,29 +166,29 @@ GEM
easy_translate (0.5.1)
thread
thread_safe
elasticsearch (6.0.1)
elasticsearch-api (= 6.0.1)
elasticsearch-transport (= 6.0.1)
elasticsearch-api (6.0.1)
elasticsearch (6.0.2)
elasticsearch-api (= 6.0.2)
elasticsearch-transport (= 6.0.2)
elasticsearch-api (6.0.2)
multi_json
elasticsearch-dsl (0.1.5)
elasticsearch-transport (6.0.1)
elasticsearch-transport (6.0.2)
faraday
multi_json
encryptor (3.0.0)
equatable (0.5.0)
erubi (1.7.1)
et-orbi (1.0.9)
et-orbi (1.1.0)
tzinfo
excon (0.60.0)
excon (0.62.0)
fabrication (2.20.1)
faker (1.8.7)
i18n (>= 0.7)
faraday (0.14.0)
faraday (0.15.0)
multipart-post (>= 1.2, < 3)
fast_blank (1.0.0)
fastimage (2.1.1)
ffi (1.9.21)
ffi (1.9.23)
fog-core (1.45.0)
builder
excon (~> 0.58)
@ -202,9 +196,9 @@ GEM
fog-json (1.0.2)
fog-core (~> 1.0)
multi_json (~> 1.10)
fog-local (0.4.0)
fog-core (~> 1.27)
fog-openstack (0.1.23)
fog-local (0.5.0)
fog-core (>= 1.27, < 3.0)
fog-openstack (0.1.25)
fog-core (~> 1.40)
fog-json (>= 1.0)
ipaddress (>= 0.8)
@ -237,20 +231,20 @@ GEM
hitimes (1.2.6)
hkdf (0.3.0)
htmlentities (4.3.4)
http (3.0.0)
http (3.2.0)
addressable (~> 2.3)
http-cookie (~> 1.0)
http-form_data (>= 2.0.0.pre.pre2, < 3)
http-form_data (~> 2.0)
http_parser.rb (~> 0.6.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
http-form_data (2.0.0)
http-form_data (2.1.0)
http_accept_language (2.1.1)
http_parser.rb (0.6.0)
httplog (1.0.2)
colorize (~> 0.8)
rack (>= 1.0)
i18n (1.0.0)
i18n (1.0.1)
concurrent-ruby (~> 1.0)
i18n-tasks (0.9.21)
activesupport (>= 4.0.2)
@ -265,7 +259,7 @@ GEM
idn-ruby (0.1.0)
ipaddress (0.8.3)
iso-639 (0.2.8)
jmespath (1.3.1)
jmespath (1.4.0)
json (2.1.0)
json-ld (2.2.1)
multi_json (~> 1.12)
@ -297,7 +291,7 @@ GEM
letter_opener (~> 1.0)
railties (>= 3.2)
link_header (0.0.8)
lograge (0.9.0)
lograge (0.10.0)
actionpack (>= 4)
activesupport (>= 4)
railties (>= 4)
@ -341,7 +335,7 @@ GEM
concurrent-ruby (~> 1.0.0)
sidekiq (>= 3.5.0)
statsd-ruby (~> 1.2.0)
oj (3.4.0)
oj (3.5.1)
omniauth (1.8.1)
hashie (>= 3.4.6, < 3.6.0)
rack (>= 1.6.2, < 3)
@ -357,7 +351,7 @@ GEM
addressable (~> 2.5)
http (~> 3.0)
nokogiri (~> 1.8)
ox (2.8.2)
ox (2.9.2)
paperclip (6.0.0)
activemodel (>= 4.2.0)
activesupport (>= 4.2.0)
@ -368,7 +362,7 @@ GEM
av (~> 0.9.0)
paperclip (>= 2.5.2)
parallel (1.12.1)
parallel_tests (2.21.1)
parallel_tests (2.21.3)
parallel
parser (2.5.1.0)
ast (~> 2.4.0)
@ -378,7 +372,7 @@ GEM
pg (1.0.0)
pghero (2.1.0)
activerecord
pkg-config (1.2.9)
pkg-config (1.3.0)
powerpack (0.1.1)
premailer (1.11.1)
addressable
@ -394,7 +388,7 @@ GEM
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (3.0.2)
puma (3.11.3)
puma (3.11.4)
pundit (1.1.0)
activesupport (>= 3.0.0)
rack (2.0.4)
@ -443,10 +437,10 @@ GEM
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
rake (12.3.1)
rb-fsevent (0.10.2)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rdf (3.0.1)
rdf (3.0.2)
hamster (~> 3.0)
link_header (~> 0.0, >= 0.0.8)
rdf-normalize (0.3.3)
@ -468,9 +462,9 @@ GEM
redis-actionpack (>= 5.0, < 6)
redis-activesupport (>= 5.0, < 6)
redis-store (>= 1.2, < 2)
redis-store (1.4.1)
redis-store (1.5.0)
redis (>= 2.2, < 5)
request_store (1.4.0)
request_store (1.4.1)
rack (>= 1.4)
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
@ -501,9 +495,9 @@ GEM
rspec-core (~> 3.0, >= 3.0.0)
sidekiq (>= 2.4.0)
rspec-support (3.7.1)
rubocop (0.52.1)
rubocop (0.55.0)
parallel (~> 1.10)
parser (>= 2.4.0.2, < 3.0)
parser (>= 2.5)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
@ -519,14 +513,14 @@ GEM
crass (~> 1.0.2)
nokogiri (>= 1.4.4)
nokogumbo (~> 1.4)
sass (3.5.5)
sass (3.5.6)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
scss_lint (0.56.0)
scss_lint (0.57.0)
rake (>= 0.9, < 13)
sass (~> 3.5.3)
sass (~> 3.5.5)
sidekiq (5.1.3)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
@ -548,8 +542,8 @@ GEM
simple_form (4.0.0)
actionpack (> 4)
activemodel (> 4)
simplecov (0.15.1)
docile (~> 1.1.0)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
@ -581,10 +575,10 @@ GEM
timers (4.1.2)
hitimes
tty-color (0.4.2)
tty-command (0.7.0)
tty-command (0.8.0)
pastel (~> 0.7.0)
tty-cursor (0.5.0)
tty-prompt (0.15.0)
tty-prompt (0.16.0)
necromancer (~> 0.4.0)
pastel (~> 0.7.0)
timers (~> 4.0)
@ -604,7 +598,7 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
unicode-display_width (1.3.0)
unicode-display_width (1.3.2)
uniform_notifier (1.11.0)
warden (1.2.7)
rack (>= 1.0)
@ -634,7 +628,7 @@ DEPENDENCIES
active_record_query_trace (~> 1.5)
addressable (~> 2.5)
annotate (~> 2.7)
aws-sdk-s3 (~> 1.8)
aws-sdk-s3 (~> 1.9)
better_errors (~> 2.4)
binding_of_caller (~> 0.7)
bootsnap (~> 1.3)
@ -652,23 +646,23 @@ DEPENDENCIES
cld3 (~> 3.2.0)
climate_control (~> 0.2)
devise (~> 4.4)
devise-two-factor (~> 3.0)!
devise-two-factor (~> 3.0)
devise_pam_authenticatable2 (~> 9.1)
doorkeeper (~> 4.3)
dotenv-rails (~> 2.2)
dotenv-rails (~> 2.2, < 2.3)
fabrication (~> 2.20)
faker (~> 1.8)
fast_blank (~> 1.0)
fastimage
fog-core (~> 1.45)
fog-local (~> 0.4)
fog-local (~> 0.5)
fog-openstack (~> 0.1)
fuubar (~> 2.2)
goldfinger (~> 2.1)
hamlit-rails (~> 0.2)
hiredis (~> 0.6)
htmlentities (~> 4.3)
http (~> 3.0)
http (~> 3.2)
http_accept_language (~> 2.1)
httplog (~> 1.0)
i18n-tasks (~> 0.9)
@ -679,7 +673,7 @@ DEPENDENCIES
letter_opener (~> 1.4)
letter_opener_web (~> 1.3)
link_header (~> 0.0)
lograge (~> 0.9)
lograge (~> 0.10)
mario-redis-lock (~> 1.2)
memory_profiler
microformats (~> 4.0)
@ -687,18 +681,18 @@ DEPENDENCIES
net-ldap (~> 0.10)
nokogiri (~> 1.8)
nsa (~> 0.2)
oj (~> 3.4)
oj (~> 3.5)
omniauth (~> 1.2)
omniauth-cas (~> 1.1)
omniauth-saml (~> 1.10)
ostatus2 (~> 2.0)
ox (~> 2.8)
ox (~> 2.9)
paperclip (~> 6.0)
paperclip-av-transcoder (~> 0.6)
parallel_tests (~> 2.21)
pg (~> 1.0)
pghero (~> 2.1)
pkg-config (~> 1.2)
pkg-config (~> 1.3)
premailer-rails
private_address_check (~> 0.4.1)
pry-rails (~> 0.3)
@ -719,24 +713,24 @@ DEPENDENCIES
rspec-rails (~> 3.7)
rspec-retry (~> 0.5)
rspec-sidekiq (~> 3.0)
rubocop
rubocop (~> 0.55)
ruby-oembed (~> 0.12)
ruby-progressbar (~> 1.4)
sanitize (~> 4.6)
scss_lint (~> 0.55)
scss_lint (~> 0.57)
sidekiq (~> 5.1)
sidekiq-bulk (~> 0.1.1)
sidekiq-scheduler (~> 2.2)
sidekiq-unique-jobs (~> 5.0)
simple-navigation (~> 4.0)
simple_form (~> 4.0)
simplecov (~> 0.14)
simplecov (~> 0.16)
sprockets-rails (~> 3.2)
stoplight (~> 2.1.3)
streamio-ffmpeg (~> 3.0)
strong_migrations (~> 0.2)
tty-command
tty-prompt
tty-command (~> 0.8)
tty-prompt (~> 0.16)
twitter-text (~> 1.14)
tzinfo-data (~> 1.2018)
webmock (~> 3.3)

4
app/models/account.rb
View File

@ -3,7 +3,7 @@
#
# Table name: accounts
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# username :string default(""), not null
# domain :string
# secret :string default(""), not null
@ -42,7 +42,7 @@
# followers_url :string default(""), not null
# protocol :integer default("ostatus"), not null
# memorial :boolean default(FALSE), not null
# moved_to_account_id :integer
# moved_to_account_id :bigint(8)
# featured_collection_url :string
# fields :jsonb
#

4
app/models/account_domain_block.rb
View File

@ -3,11 +3,11 @@
#
# Table name: account_domain_blocks
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# domain :string
# created_at :datetime not null
# updated_at :datetime not null
# account_id :integer
# account_id :bigint(8)
#
class AccountDomainBlock < ApplicationRecord

6
app/models/account_moderation_note.rb
View File

@ -3,10 +3,10 @@
#
# Table name: account_moderation_notes
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# content :text not null
# account_id :integer not null
# target_account_id :integer not null
# account_id :bigint(8) not null
# target_account_id :bigint(8) not null
# created_at :datetime not null
# updated_at :datetime not null
#

6
app/models/admin/action_log.rb
View File

@ -3,11 +3,11 @@
#
# Table name: admin_action_logs
#
# id :integer not null, primary key
# account_id :integer
# id :bigint(8) not null, primary key
# account_id :bigint(8)
# action :string default(""), not null
# target_type :string
# target_id :integer
# target_id :bigint(8)
# recorded_changes :text default(""), not null
# created_at :datetime not null
# updated_at :datetime not null

4
app/models/backup.rb
View File

@ -3,8 +3,8 @@
#
# Table name: backups
#
# id :integer not null, primary key
# user_id :integer
# id :bigint(8) not null, primary key
# user_id :bigint(8)
# dump_file_name :string
# dump_content_type :string
# dump_file_size :integer

6
app/models/block.rb
View File

@ -3,11 +3,11 @@
#
# Table name: blocks
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# created_at :datetime not null
# updated_at :datetime not null
# account_id :integer not null
# target_account_id :integer not null
# account_id :bigint(8) not null
# target_account_id :bigint(8) not null
#
class Block < ApplicationRecord

2
app/models/conversation.rb
View File

@ -3,7 +3,7 @@
#
# Table name: conversations
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# uri :string
# created_at :datetime not null
# updated_at :datetime not null

6
app/models/conversation_mute.rb
View File

@ -3,9 +3,9 @@
#
# Table name: conversation_mutes
#
# id :integer not null, primary key
# conversation_id :integer not null
# account_id :integer not null
# id :bigint(8) not null, primary key
# conversation_id :bigint(8) not null
# account_id :bigint(8) not null
#
class ConversationMute < ApplicationRecord

2
app/models/custom_emoji.rb
View File

@ -3,7 +3,7 @@
#
# Table name: custom_emojis
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# shortcode :string default(""), not null
# domain :string
# image_file_name :string

2
app/models/domain_block.rb
View File

@ -3,7 +3,7 @@
#
# Table name: domain_blocks
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# domain :string default(""), not null
# created_at :datetime not null
# updated_at :datetime not null

2
app/models/email_domain_block.rb
View File

@ -3,7 +3,7 @@
#
# Table name: email_domain_blocks
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# domain :string default(""), not null
# created_at :datetime not null
# updated_at :datetime not null

6
app/models/favourite.rb
View File

@ -3,11 +3,11 @@
#
# Table name: favourites
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# created_at :datetime not null
# updated_at :datetime not null
# account_id :integer not null
# status_id :integer not null
# account_id :bigint(8) not null
# status_id :bigint(8) not null
#
class Favourite < ApplicationRecord

6
app/models/follow.rb
View File

@ -3,11 +3,11 @@
#
# Table name: follows
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# created_at :datetime not null
# updated_at :datetime not null
# account_id :integer not null
# target_account_id :integer not null
# account_id :bigint(8) not null
# target_account_id :bigint(8) not null
# show_reblogs :boolean default(TRUE), not null
#

6
app/models/follow_request.rb
View File

@ -3,11 +3,11 @@
#
# Table name: follow_requests
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# created_at :datetime not null
# updated_at :datetime not null
# account_id :integer not null
# target_account_id :integer not null
# account_id :bigint(8) not null
# target_account_id :bigint(8) not null
# show_reblogs :boolean default(TRUE), not null
#

4
app/models/import.rb
View File

@ -3,7 +3,7 @@
#
# Table name: imports
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# type :integer not null
# approved :boolean default(FALSE), not null
# created_at :datetime not null
@ -12,7 +12,7 @@
# data_content_type :string
# data_file_size :integer
# data_updated_at :datetime
# account_id :integer not null
# account_id :bigint(8) not null
#
class Import < ApplicationRecord

4
app/models/invite.rb
View File

@ -3,8 +3,8 @@
#
# Table name: invites
#
# id :integer not null, primary key
# user_id :integer not null
# id :bigint(8) not null, primary key
# user_id :bigint(8) not null
# code :string default(""), not null
# expires_at :datetime
# max_uses :integer

4
app/models/list.rb
View File

@ -3,8 +3,8 @@
#
# Table name: lists
#
# id :integer not null, primary key
# account_id :integer not null
# id :bigint(8) not null, primary key
# account_id :bigint(8) not null
# title :string default(""), not null
# created_at :datetime not null
# updated_at :datetime not null

8
app/models/list_account.rb
View File

@ -3,10 +3,10 @@
#
# Table name: list_accounts
#
# id :integer not null, primary key
# list_id :integer not null
# account_id :integer not null
# follow_id :integer not null
# id :bigint(8) not null, primary key
# list_id :bigint(8) not null
# account_id :bigint(8) not null
# follow_id :bigint(8) not null
#
class ListAccount < ApplicationRecord

6
app/models/media_attachment.rb
View File

@ -3,8 +3,8 @@
#
# Table name: media_attachments
#
# id :integer not null, primary key
# status_id :integer
# id :bigint(8) not null, primary key
# status_id :bigint(8)
# file_file_name :string
# file_content_type :string
# file_file_size :integer
@ -15,7 +15,7 @@
# shortcode :string
# type :integer default("image"), not null
# file_meta :json
# account_id :integer
# account_id :bigint(8)
# description :text
#

6
app/models/mention.rb
View File

@ -3,11 +3,11 @@
#
# Table name: mentions
#
# id :integer not null, primary key
# status_id :integer
# id :bigint(8) not null, primary key
# status_id :bigint(8)
# created_at :datetime not null
# updated_at :datetime not null
# account_id :integer
# account_id :bigint(8)
#
class Mention < ApplicationRecord

6
app/models/mute.rb
View File

@ -3,11 +3,11 @@
#
# Table name: mutes
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# created_at :datetime not null
# updated_at :datetime not null
# account_id :integer not null
# target_account_id :integer not null
# account_id :bigint(8) not null
# target_account_id :bigint(8) not null
# hide_notifications :boolean default(TRUE), not null
#

8
app/models/notification.rb
View File

@ -3,13 +3,13 @@
#
# Table name: notifications
#
# id :integer not null, primary key
# activity_id :integer not null
# id :bigint(8) not null, primary key
# activity_id :bigint(8) not null
# activity_type :string not null
# created_at :datetime not null
# updated_at :datetime not null
# account_id :integer not null
# from_account_id :integer not null
# account_id :bigint(8) not null
# from_account_id :bigint(8) not null
#
class Notification < ApplicationRecord

2
app/models/preview_card.rb
View File

@ -3,7 +3,7 @@
#
# Table name: preview_cards
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# url :string default(""), not null
# title :string default(""), not null
# description :string default(""), not null

12
app/models/report.rb
View File

@ -3,16 +3,16 @@
#
# Table name: reports
#
# id :integer not null, primary key
# status_ids :integer default([]), not null, is an Array
# id :bigint(8) not null, primary key
# status_ids :bigint(8) default([]), not null, is an Array
# comment :text default(""), not null
# action_taken :boolean default(FALSE), not null
# created_at :datetime not null
# updated_at :datetime not null
# account_id :integer not null
# action_taken_by_account_id :integer
# target_account_id :integer not null
# assigned_account_id :integer
# account_id :bigint(8) not null
# action_taken_by_account_id :bigint(8)
# target_account_id :bigint(8) not null
# assigned_account_id :bigint(8)
#
class Report < ApplicationRecord

6
app/models/report_note.rb
View File

@ -3,10 +3,10 @@
#
# Table name: report_notes
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# content :text not null
# report_id :integer not null
# account_id :integer not null
# report_id :bigint(8) not null
# account_id :bigint(8) not null
# created_at :datetime not null
# updated_at :datetime not null
#

8
app/models/session_activation.rb
View File

@ -3,15 +3,15 @@
#
# Table name: session_activations
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# session_id :string not null
# created_at :datetime not null
# updated_at :datetime not null
# user_agent :string default(""), not null
# ip :inet
# access_token_id :integer
# user_id :integer not null
# web_push_subscription_id :integer
# access_token_id :bigint(8)
# user_id :bigint(8) not null
# web_push_subscription_id :bigint(8)
#
class SessionActivation < ApplicationRecord

4
app/models/setting.rb
View File

@ -3,13 +3,13 @@
#
# Table name: settings
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# var :string not null
# value :text
# thing_type :string
# created_at :datetime
# updated_at :datetime
# thing_id :integer
# thing_id :bigint(8)
#
class Setting < RailsSettings::Base

2
app/models/site_upload.rb
View File

@ -3,7 +3,7 @@
#
# Table name: site_uploads
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# var :string default(""), not null
# file_file_name :string
# file_content_type :string

14
app/models/status.rb
View File

@ -3,13 +3,13 @@
#
# Table name: statuses
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# uri :string
# text :text default(""), not null
# created_at :datetime not null
# updated_at :datetime not null
# in_reply_to_id :integer
# reblog_of_id :integer
# in_reply_to_id :bigint(8)
# reblog_of_id :bigint(8)
# url :string
# sensitive :boolean default(FALSE), not null
# visibility :integer default("public"), not null
@ -18,11 +18,11 @@
# favourites_count :integer default(0), not null
# reblogs_count :integer default(0), not null
# language :string
# conversation_id :integer
# conversation_id :bigint(8)
# local :boolean
# account_id :integer not null
# application_id :integer
# in_reply_to_account_id :integer
# account_id :bigint(8) not null
# application_id :bigint(8)
# in_reply_to_account_id :bigint(8)
#
class Status < ApplicationRecord

6
app/models/status_pin.rb
View File

@ -3,9 +3,9 @@
#
# Table name: status_pins
#
# id :integer not null, primary key
# account_id :integer not null
# status_id :integer not null
# id :bigint(8) not null, primary key
# account_id :bigint(8) not null
# status_id :bigint(8) not null
# created_at :datetime not null
# updated_at :datetime not null
#

6
app/models/stream_entry.rb
View File

@ -3,13 +3,13 @@
#
# Table name: stream_entries
#
# id :integer not null, primary key
# activity_id :integer
# id :bigint(8) not null, primary key
# activity_id :bigint(8)
# activity_type :string
# created_at :datetime not null
# updated_at :datetime not null
# hidden :boolean default(FALSE), not null
# account_id :integer
# account_id :bigint(8)
#
class StreamEntry < ApplicationRecord

4
app/models/subscription.rb
View File

@ -3,7 +3,7 @@
#
# Table name: subscriptions
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# callback_url :string default(""), not null
# secret :string
# expires_at :datetime
@ -12,7 +12,7 @@
# updated_at :datetime not null
# last_successful_delivery_at :datetime
# domain :string
# account_id :integer not null
# account_id :bigint(8) not null
#
class Subscription < ApplicationRecord

2
app/models/tag.rb
View File

@ -3,7 +3,7 @@
#
# Table name: tags
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# name :string default(""), not null
# created_at :datetime not null
# updated_at :datetime not null

6
app/models/user.rb
View File

@ -3,7 +3,7 @@
#
# Table name: users
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# email :string default(""), not null
# created_at :datetime not null
# updated_at :datetime not null
@ -30,10 +30,10 @@
# last_emailed_at :datetime
# otp_backup_codes :string is an Array
# filtered_languages :string default([]), not null, is an Array
# account_id :integer not null
# account_id :bigint(8) not null
# disabled :boolean default(FALSE), not null
# moderator :boolean default(FALSE), not null
# invite_id :integer
# invite_id :bigint(8)
# remember_token :string
#

2
app/models/web/push_subscription.rb
View File

@ -3,7 +3,7 @@
#
# Table name: web_push_subscriptions
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# endpoint :string not null
# key_p256dh :string not null
# key_auth :string not null

4
app/models/web/setting.rb
View File

@ -3,11 +3,11 @@
#
# Table name: web_settings
#
# id :integer not null, primary key
# id :bigint(8) not null, primary key
# data :json
# created_at :datetime not null
# updated_at :datetime not null
# user_id :integer not null
# user_id :bigint(8) not null
#
class Web::Setting < ApplicationRecord

2
config/deploy.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
lock '3.10.1'
lock '3.10.2'
set :repo_url, ENV.fetch('REPO', 'https://github.com/tootsuite/mastodon.git')
set :branch, ENV.fetch('BRANCH', 'master')