diff --git a/Gemfile.lock b/Gemfile.lock index 1663e0615..8733a2c64 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,7 +92,7 @@ GEM av (0.9.0) cocaine (~> 0.5.3) aws-eventstream (1.1.0) - aws-partitions (1.338.0) + aws-partitions (1.340.0) aws-sdk-core (3.103.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -101,7 +101,7 @@ GEM aws-sdk-kms (1.36.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.73.0) + aws-sdk-s3 (1.74.0) aws-sdk-core (~> 3, >= 3.102.1) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -374,7 +374,7 @@ GEM net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.1.0) nio4r (2.5.2) - nokogiri (1.10.9) + nokogiri (1.10.10) mini_portile2 (~> 2.4.0) nokogumbo (2.0.2) nokogiri (~> 1.8, >= 1.8.4) @@ -396,7 +396,7 @@ GEM ruby-saml (~> 1.9) orm_adapter (0.5.0) ox (2.13.2) - paperclip (6.0.0) + paperclip (6.1.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) mime-types @@ -415,7 +415,7 @@ GEM equatable (~> 0.6) tty-color (~> 0.5) pg (1.2.3) - pghero (2.5.1) + pghero (2.6.0) activerecord (>= 5) pkg-config (1.4.1) premailer (1.11.1) @@ -474,7 +474,7 @@ GEM rails-i18n (5.1.3) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) - rails-settings-cached (0.6.6) + rails-settings-cached (0.7.2) rails (>= 4.2.0) railties (5.2.4.3) actionpack (= 5.2.4.3) @@ -543,13 +543,13 @@ GEM rspec-support (3.9.3) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (0.86.0) + rubocop (0.87.1) parallel (~> 1.10) - parser (>= 2.7.0.1) + parser (>= 2.7.1.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.7) rexml - rubocop-ast (>= 0.0.3, < 1.0) + rubocop-ast (>= 0.1.0, < 1.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) rubocop-ast (0.1.0) @@ -654,7 +654,7 @@ GEM rack-proxy (>= 0.6.1) railties (>= 5.2) semantic_range (>= 2.3.0) - webpush (0.3.8) + webpush (1.0.0) hkdf (~> 0.2) jwt (~> 2.0) websocket-driver (0.7.2) diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index 519711401..51e0175f6 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -23,7 +23,7 @@ # file_storage_schema_version :integer # thumbnail_file_name :string # thumbnail_content_type :string -# thumbnail_file_size :integer +# thumbnail_file_size :bigint(8) # thumbnail_updated_at :datetime # thumbnail_remote_url :string # diff --git a/db/schema.rb b/db/schema.rb index cf31b6d23..fc55f5500 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -835,6 +835,16 @@ ActiveRecord::Schema.define(version: 2020_06_28_133322) do t.index ["domain"], name: "index_unavailable_domains_on_domain", unique: true end + create_table "user_groups", force: :cascade do |t| + t.string "name", null: false + t.datetime "createdAt" + t.string "visibility" + t.integer "account_id" + t.integer "creator_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "user_invite_requests", force: :cascade do |t| t.bigint "user_id" t.text "text"