diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-02-26 17:04:44 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-02-26 17:04:44 +0100 |
commit | 0158937fc2345a83f8ee5a64e85b14cabfe4b1e7 (patch) | |
tree | 79872e72c27d6371620c0dd8f04700aa0094020c /app/chewy | |
parent | d82de360c13894746d3974d11c9505c8937ebdee (diff) | |
parent | a5e7ada62fa2824be158f0b3bed7f3c39ce9c0fa (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - Dockerfile Took upstream version and reverted f13ebd02c91776ddb88b5178bf9015c6e0f1ca80. Hopefuly it's not needed anymore. - app/controllers/api/v1/search_controller.rb The conflict was due to us raising the number of results returned. Upstream raised it further, so took it. - config/locales/de.yml Took upstream changes to theme translation strings. - config/locales/gl.yml Took upstream changes to theme translation strings. - config/locales/nl.yml Took upstream changes to theme translation strings. - config/locales/sk.yml Took upstream changes to theme translation strings.
Diffstat (limited to 'app/chewy')
-rw-r--r-- | app/chewy/statuses_index.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/chewy/statuses_index.rb b/app/chewy/statuses_index.rb index eafc1818b..8ce413f8a 100644 --- a/app/chewy/statuses_index.rb +++ b/app/chewy/statuses_index.rb @@ -48,6 +48,7 @@ class StatusesIndex < Chewy::Index end root date_detection: false do + field :id, type: 'long' field :account_id, type: 'long' field :text, type: 'text', value: ->(status) { [status.spoiler_text, Formatter.instance.plaintext(status)].concat(status.media_attachments.map(&:description)).join("\n\n") } do @@ -55,7 +56,6 @@ class StatusesIndex < Chewy::Index end field :searchable_by, type: 'long', value: ->(status, crutches) { status.searchable_by(crutches) } - field :created_at, type: 'date' end end end |