diff options
| author | ThibG <thib@sitedethib.com> | 2019-11-21 10:01:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-21 10:01:26 +0100 |
| commit | 55f5e81a9dc4c6cede5d43e549061be2ea9be614 (patch) | |
| tree | 6b8944b2bf8e13ba76627a0e38886dfb3b35c566 /app/models | |
| parent | 707c4918b21d19dd53b64120dbc7263f45fc5ecd (diff) | |
| parent | e87cc59811fab285033cc78d97ad7f0b8df9c081 (diff) | |
Merge pull request #1246 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models')
| -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 916261a17..01dc48ee7 100644 --- a/app/models/bookmark.rb +++ b/app/models/bookmark.rb @@ -3,11 +3,11 @@ # # Table name: bookmarks # -# id :bigint(8) not null, primary key -# account_id :bigint(8) not null -# status_id :bigint(8) not null +# id :integer not null, primary key # created_at :datetime not null # updated_at :datetime not null +# account_id :integer not null +# status_id :integer not null # class Bookmark < ApplicationRecord |