diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-05 19:23:16 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-05 19:23:16 +0100 |
| commit | f513317ba262d9f5d7aa7dd66f8b61690297e107 (patch) | |
| tree | 6732fcf1178fc3e27404c6830bc2bc1c832659ae /app/models/export.rb | |
| parent | 2a4ce7458a16c64029842fde210089453be2ede1 (diff) | |
| parent | 7d5e2dda78414316f9cf09fcf6096d6a158da312 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.
Diffstat (limited to 'app/models/export.rb')
| -rw-r--r-- | app/models/export.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/export.rb b/app/models/export.rb index fc4bb6964..9bf866d35 100644 --- a/app/models/export.rb +++ b/app/models/export.rb @@ -23,7 +23,7 @@ class Export def to_lists_csv CSV.generate do |csv| - account.owned_lists.select(:title).each do |list| + account.owned_lists.select(:title, :id).each do |list| list.accounts.select(:username, :domain).each do |account| csv << [list.title, acct(account)] end |