diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-25 15:01:00 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-25 15:01:00 +0100 |
| commit | 51a7047367960af1d710383266a09608170eb56c (patch) | |
| tree | f6527133096c878639852dd76aca415ac76d0f15 | |
| parent | ca04002c933539a2ccefe227f6a6eecbb4c074c6 (diff) | |
Fix order of migrations
| -rw-r--r-- | app/assets/javascripts/components/components/status_content.jsx | 2 | ||||
| -rw-r--r-- | db/migrate/20170125145934_add_spoiler_text_to_statuses.rb (renamed from db/migrate/20170114014334_add_spoiler_text_to_statuses.rb) | 0 | ||||
| -rw-r--r-- | db/schema.rb | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/components/components/status_content.jsx b/app/assets/javascripts/components/components/status_content.jsx index fbb413465..476e228a3 100644 --- a/app/assets/javascripts/components/components/status_content.jsx +++ b/app/assets/javascripts/components/components/status_content.jsx @@ -85,7 +85,7 @@ const StatusContent = React.createClass({ const { hidden } = this.state; const content = { __html: emojify(status.get('content')) }; - const spoilerContent = { __html: emojify(status.get('spoiler_text')) }; + const spoilerContent = { __html: emojify(status.get('spoiler_text', '')) }; if (status.get('spoiler_text').length > 0) { const toggleText = hidden ? <FormattedMessage id='status.show_more' defaultMessage='Show more' /> : <FormattedMessage id='status.show_less' defaultMessage='Show less' />; diff --git a/db/migrate/20170114014334_add_spoiler_text_to_statuses.rb b/db/migrate/20170125145934_add_spoiler_text_to_statuses.rb index e4065d7db..e4065d7db 100644 --- a/db/migrate/20170114014334_add_spoiler_text_to_statuses.rb +++ b/db/migrate/20170125145934_add_spoiler_text_to_statuses.rb diff --git a/db/schema.rb b/db/schema.rb index 0edd68605..ee4dd4316 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170123203248) do +ActiveRecord::Schema.define(version: 20170125145934) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -195,8 +195,8 @@ ActiveRecord::Schema.define(version: 20170123203248) do t.boolean "sensitive", default: false t.integer "visibility", default: 0, null: false t.integer "in_reply_to_account_id" - t.text "spoiler_text", default: "" t.integer "application_id" + t.text "spoiler_text", default: "" t.index ["account_id"], name: "index_statuses_on_account_id", using: :btree t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id", using: :btree t.index ["reblog_of_id"], name: "index_statuses_on_reblog_of_id", using: :btree |