cybrespace/mastodon
4
3
Fork 3
Code Issues 7 Pull requests Releases Activity

Merge 2.7.3 #8

Merged
chr merged 70 commits from upstream_v2.7.3 into cybrespace 2019-02-24 01:55:42 +01:00
Conversation 0 Commits 70 Files changed 86 +3 -2
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d23a7f9726 - Show all commits

5
app/views/admin/accounts/index.html.haml
View file

@ -26,8 +26,9 @@
= hidden_field_tag key, params[key] = hidden_field_tag key, params[key]
- %i(username by_domain display_name email ip).each do |key| - %i(username by_domain display_name email ip).each do |key|
.input.string.optional - unless key == :by_domain && params[:remote].blank?
= text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.accounts.#{key}") .input.string.optional
= text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.accounts.#{key}")
.actions .actions
%button= t('admin.accounts.search') %button= t('admin.accounts.search')