Merge pull request #222 from yipdw/merge/tootsuite/master

Merge upstream (e28b33c.. 94c5a11)

Dockerfile

@@ -48,7 +48,7 @@ RUN apk -U upgrade \
  && rm yarn.tar.gz \
  && mv /tmp/src/yarn-v$YARN_VERSION /opt/yarn \
  && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
- && wget -O libiconv.tar.gz "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$LIBICONV_VERSION.tar.gz" \
+ && wget -O libiconv.tar.gz "https://ftp.gnu.org/pub/gnu/libiconv/libiconv-$LIBICONV_VERSION.tar.gz" \
  && echo "$LIBICONV_DOWNLOAD_SHA256 *libiconv.tar.gz" | sha256sum -c - \
  && tar -xzf libiconv.tar.gz -C /tmp/src \
  && rm libiconv.tar.gz \

app/controllers/admin/custom_emojis_controller.rb

@@ -45,9 +45,10 @@ module Admin
     def copy
       authorize @custom_emoji, :copy?
 
-      emoji = CustomEmoji.find_or_create_by(domain: nil, shortcode: @custom_emoji.shortcode)
+      emoji = CustomEmoji.find_or_initialize_by(domain: nil, shortcode: @custom_emoji.shortcode)
+      emoji.image = @custom_emoji.image
 
-      if emoji.updatespan>(image: @custom_emoji.image)
+      if emoji.save
         flash[:notice] = I18n.t('admin.custom_emojis.copied_msg')
       else
         flash[:alert] = I18n.t('admin.custom_emojis.copy_failed_msg')

app/javascript/styles/mastodon/accounts.scss

@@ -582,8 +582,8 @@
   }
 
   &.admin {
-    color: $error-red;
-    background-color: rgba($error-red, 0.1);
-    border-color: rgba($error-red, 0.5);
+    color: lighten($error-red, 12%);
+    background-color: rgba(lighten($error-red, 12%), 0.1);
+    border-color: rgba(lighten($error-red, 12%), 0.5);
   }
 }

app/views/admin/accounts/show.html.haml

@@ -15,6 +15,12 @@
         %td= @account.display_name
 
       - if @account.local?
+        %tr
+          %th= t('admin.accounts.role')
+          %td
+            = t("admin.accounts.roles.#{@account.user&.role}")
+            = table_link_to 'angle-double-up', t('admin.accounts.promote'), promote_admin_account_role_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:promote, @account.user)
+            = table_link_to 'angle-double-down', t('admin.accounts.demote'), demote_admin_account_role_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:demote, @account.user)
         %tr
           %th= t('admin.accounts.email')
           %td
@@ -145,20 +151,6 @@
           %th= t('admin.accounts.followers_url')
           %td= link_to @account.followers_url, @account.followers_url
 
-- else
-  %hr
-
-  .table-wrapper
-    %table.table
-      %tbody
-        %tr
-          %th= t('admin.accounts.role')
-          %td
-            = t("admin.accounts.roles.#{@account.user&.role}")
-          %td<
-            = table_link_to 'angle-double-up', t('admin.accounts.promote'), promote_admin_account_role_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:promote, @account.user)
-            = table_link_to 'angle-double-down', t('admin.accounts.demote'), demote_admin_account_role_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:demote, @account.user)
-
 %hr
 %h3= t('admin.accounts.moderation_notes')