~cytrogen/masto-fe

7778de467cd35fa4a514dd97ced0d19675f3b9d9 — Thibaut Girka 6 years ago fc6d27d + 5bcd981
Merge branch 'master' into glitch-soc/merge-upstream
M app/javascript/mastodon/components/status.js => app/javascript/mastodon/components/status.js +5 -0
@@ 171,6 171,11 @@ class Status extends ImmutablePureComponent {
  }

  handleExpandClick = (e) => {
    if (this.props.onClick) {
      this.props.onClick();
      return;
    }

    if (e.button === 0) {
      if (!this.context.router) {
        return;

M app/views/settings/preferences/other/show.html.haml => app/views/settings/preferences/other/show.html.haml +1 -1
@@ 1,7 1,7 @@
- content_for :page_title do
  = t('settings.preferences')

= simple_form_for current_user, url: settings_preferences_path, html: { method: :put } do |f|
= simple_form_for current_user, url: settings_preferences_other_path, html: { method: :put } do |f|
  = render 'shared/error_messages', object: current_user

  .fields-group