Permalink
Browse files

アホみたいなコンフリクトの修正

  • Loading branch information...
eai04191 committed Jan 26, 2019
1 parent bc65fdf commit 292f51d9960530d2f38c202b8b911b23f4c28b19
Showing with 4 additions and 1 deletion.
  1. +3 −0 app/javascript/mastodon/components/status_action_bar.js
  2. +1 −1 app/models/account.rb
@@ -150,6 +150,7 @@ class StatusActionBar extends ImmutablePureComponent {

let menu = [];
let reblogIcon = 'retweet';
let replyIcon;
let replyTitle;

menu.push({ text: intl.formatMessage(messages.open), action: this.handleOpen });
@@ -197,8 +198,10 @@ class StatusActionBar extends ImmutablePureComponent {
}

if (status.get('in_reply_to_id', null) === null) {
replyIcon = 'reply';
replyTitle = intl.formatMessage(messages.reply);
} else {
replyIcon = 'reply-all';
replyTitle = intl.formatMessage(messages.replyAll);
}

@@ -75,7 +75,7 @@ class Account < ApplicationRecord
validates_with UniqueUsernameValidator, if: -> { local? && will_save_change_to_username? }
validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? }
validates :display_name, length: { maximum: 50 }, if: -> { local? && will_save_change_to_display_name? }
validates :note, length: { maximum: 500 }, if: -> { local? && will_save_change_to_note? }
validates :note, note_length: { maximum: 500 }, if: -> { local? && will_save_change_to_note? }
validates :fields, length: { maximum: 4 }, if: -> { local? && will_save_change_to_fields? }

scope :remote, -> { where.not(domain: nil) }

0 comments on commit 292f51d

Please sign in to comment.