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 /db/migrate/20190304152020_add_uri_to_poll_votes.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 'db/migrate/20190304152020_add_uri_to_poll_votes.rb')
-rw-r--r-- | db/migrate/20190304152020_add_uri_to_poll_votes.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/db/migrate/20190304152020_add_uri_to_poll_votes.rb b/db/migrate/20190304152020_add_uri_to_poll_votes.rb new file mode 100644 index 000000000..f6b81f1ba --- /dev/null +++ b/db/migrate/20190304152020_add_uri_to_poll_votes.rb @@ -0,0 +1,5 @@ +class AddUriToPollVotes < ActiveRecord::Migration[5.2] + def change + add_column :poll_votes, :uri, :string + end +end |