monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

This commit is contained in:
Thibaut Girka 2019-06-10 20:09:05 +02:00
parent fc6d27daf3 5bcd98172c
commit 7778de467c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/mastodon/components/status.js
View File

@ -171,6 +171,11 @@ class Status extends ImmutablePureComponent {
} }
handleExpandClick = (e) => { handleExpandClick = (e) => {
if (this.props.onClick) {
this.props.onClick();
return;
}
if (e.button === 0) { if (e.button === 0) {
if (!this.context.router) { if (!this.context.router) {
return; return;

2
app/views/settings/preferences/other/show.html.haml
View File

@ -1,7 +1,7 @@
- content_for :page_title do - content_for :page_title do
= t('settings.preferences') = 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 = render 'shared/error_messages', object: current_user
.fields-group .fields-group