diff options
| author | ThibG <thib@sitedethib.com> | 2020-01-24 17:28:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-24 17:28:22 +0100 |
| commit | 0be67df4f0a64367d9e376b06bd3fd2fb9ca8195 (patch) | |
| tree | 2eaa85c899033aab9bd1b2f9da2d727ce5788e16 /app/models/bookmark.rb | |
| parent | a8c109baca4d02cc8aed454e231518c1f8ec1844 (diff) | |
| parent | bdc1581556b86ba25a385c9309db714eeaba1ca1 (diff) | |
Merge pull request #1265 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/bookmark.rb')
| -rw-r--r-- | app/models/bookmark.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb index 01dc48ee7..916261a17 100644 --- a/app/models/bookmark.rb +++ b/app/models/bookmark.rb @@ -3,11 +3,11 @@ # # Table name: bookmarks # -# id :integer not null, primary key +# 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 -# account_id :integer not null -# status_id :integer not null # class Bookmark < ApplicationRecord |