nrd.li/mastodon
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix order of migrations

Browse source
This commit is contained in:
Eugen Rochko 2017-01-25 15:01:00 +01:00
parent ca04002c93
commit 51a7047367
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/components/components/status_content.jsx
View file

@ -85,7 +85,7 @@ const StatusContent = React.createClass({
const { hidden } = this.state; const { hidden } = this.state;
const content = { __html: emojify(status.get('content')) }; 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) { 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' />; const toggleText = hidden ? <FormattedMessage id='status.show_more' defaultMessage='Show more' /> : <FormattedMessage id='status.show_less' defaultMessage='Show less' />;

0
db/migrate/20170114014334_add_spoiler_text_to_statuses.rb → db/migrate/20170125145934_add_spoiler_text_to_statuses.rb
View file

4
db/schema.rb
View file

@ -10,7 +10,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # 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 # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
@ -195,8 +195,8 @@ ActiveRecord::Schema.define(version: 20170123203248) do
t.boolean "sensitive", default: false t.boolean "sensitive", default: false
t.integer "visibility", default: 0, null: false t.integer "visibility", default: 0, null: false
t.integer "in_reply_to_account_id" t.integer "in_reply_to_account_id"
t.text "spoiler_text", default: ""
t.integer "application_id" t.integer "application_id"
t.text "spoiler_text", default: ""
t.index ["account_id"], name: "index_statuses_on_account_id", using: :btree 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 ["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 t.index ["reblog_of_id"], name: "index_statuses_on_reblog_of_id", using: :btree