diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2020-01-23 22:00:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-23 22:00:13 +0100 |
| commit | f52c988e12e464e7baefc2fdb48ddf4a95584664 (patch) | |
| tree | 1849998c1180280751f829769c10c84986bf0953 /app/models/bookmark.rb | |
| parent | 81cc86bb1ffb662843938379eeb522e3a6f11b79 (diff) | |
Add announcements (#12662)
* Add announcements Fix #11006 * Add reactions to announcements * Add admin UI for announcements * Add unit tests * Fix issues - Add `with_dismissed` param to announcements API - Fix end date not being formatted when time range is given - Fix announcement delete causing reactions to send streaming updates - Fix announcements container growing too wide and mascot too small - Fix `all_day` being settable when no time range is given - Change text "Update" to "Announcement" * Fix scheduler unpublishing announcements before they are due * Fix filter params not being passed to announcements filter
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 |