Merge pull request #5471 from svbergerem/fix-poll-answer-order

Fix order of poll answers

Changelog.md

@@ -101,6 +101,7 @@ This is disabled by default since it requires the installation of additional pac
 * Fix overflow in profile sidebar [#5450](https://github.com/diaspora/diaspora/pull/5450)
 * Fix code overflow in SPV and improve styling for code tags [#5422](https://github.com/diaspora/diaspora/pull/5422)
 * Correctly validate if local recipients actually want to receive a conversation [#5449](https://github.com/diaspora/diaspora/pull/5449)
+* Improvde consistency of poll answer ordering [#5471](https://github.com/diaspora/diaspora/pull/5471)
 
 ## Features
 * Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)

app/models/poll.rb

@@ -3,7 +3,7 @@ class Poll < ActiveRecord::Base
   include Diaspora::Guid
 
   belongs_to :status_message
-  has_many :poll_answers
+  has_many :poll_answers, -> { order 'id ASC' }
   has_many :poll_participations
 
   xml_attr :question