diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-06 22:34:42 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-06 22:34:42 -0600 |
| commit | ddb61deccefeda2346e64002528764841bcb7315 (patch) | |
| tree | 0ee86119b8260661d85e5e41a1342c30802f620b /app/models | |
| parent | 935c1944e27be4df9ba821a0f38fd599d1877a31 (diff) | |
| parent | 744447b3c04d7806e383f0d1ad7a10c73bd667ef (diff) | |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/preview_card.rb | 1 | ||||
| -rw-r--r-- | app/models/session_activation.rb | 10 |
2 files changed, 1 insertions, 10 deletions
diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb index e2bf65d94..5baddba8a 100644 --- a/app/models/preview_card.rb +++ b/app/models/preview_card.rb @@ -21,6 +21,7 @@ # height :integer default(0), not null # created_at :datetime not null # updated_at :datetime not null +# embed_url :string default(""), not null # class PreviewCard < ApplicationRecord diff --git a/app/models/session_activation.rb b/app/models/session_activation.rb index 8b711d0d6..1d4ebca02 100644 --- a/app/models/session_activation.rb +++ b/app/models/session_activation.rb @@ -14,16 +14,6 @@ # web_push_subscription_id :integer # -# id :bigint not null, primary key -# user_id :bigint not null -# 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 :bigint -# - class SessionActivation < ApplicationRecord belongs_to :user, inverse_of: :session_activations, required: true belongs_to :access_token, class_name: 'Doorkeeper::AccessToken', dependent: :destroy |