Merge commit 'f826a95f6e' into kb_migration

app/views/admin/announcements/index.html.haml

@@ -19,4 +19,3 @@
     = render partial: 'announcement', collection: @announcements
 
 = paginate @announcements
-

app/views/admin/custom_emojis/index.html.haml

@@ -91,4 +91,3 @@
         = render partial: 'custom_emoji', collection: @custom_emojis, locals: { f: f }
 
 = paginate @custom_emojis
-

app/views/admin/ip_blocks/index.html.haml

@@ -25,4 +25,3 @@
         = render partial: 'ip_block', collection: @ip_blocks, locals: { f: f }
 
 = paginate @ip_blocks
-

app/views/admin/relays/index.html.haml

@@ -17,4 +17,3 @@
           %th
       %tbody
         = render @relays
-

app/views/admin/roles/edit.html.haml

@@ -5,4 +5,3 @@
   = link_to t('admin.roles.delete'), admin_role_path(@role), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button button--destructive' if can?(:destroy, @role)
 
 = render partial: 'form'
-

app/views/settings/applications/show.html.haml

@@ -28,4 +28,3 @@
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
-

app/views/settings/preferences/appearance/show.html.haml

@@ -37,11 +37,6 @@
       = ff.input :'web.disable_swiping', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_disable_swiping')
       = ff.input :'web.use_system_font', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_system_font_ui')
 
-    %h4= t 'appearance.toot_layout'
-
-    .fields-group
-      = ff.input :'web.crop_images', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_crop_images')
-
     .fields-group
       = ff.input :'web.hide_recent_emojis', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_hide_recent_emojis'), hint: false