Merge remote-tracking branch 'upstream/pull/2434'

[rails.git] / app / views / users / account.html.erb

diff --git a/app/views/users/account.html.erb b/app/views/users/account.html.erb
index 7e8d533b066eb45046a92d5ea3e00357652e7c12..7fd6929caf964b5f3bfa4a043688198635f93ddb 100644 (file)
--- a/app/views/users/account.html.erb
+++ b/app/views/users/account.html.erb
@@ -104,19 +104,19 @@
       <label class="standard-label"><%= t ".image" %></label>
         <%= user_image current_user %>
         <ul class='form-list accountImage-options'>
-        <% if current_user.avatar.attached? || current_user.image.file? %>
+        <% if current_user.avatar.attached? %>
         <li>
           <%= radio_button_tag "avatar_action", "keep", !current_user.image_use_gravatar %>
           <label class='standard-label' for='avatar_action_keep'><%= t ".keep image" %></label>
         </li>
         <% end %>
-        <% if current_user.avatar.attached? || current_user.image.file? || current_user.image_use_gravatar? %>
+        <% if current_user.avatar.attached? || current_user.image_use_gravatar? %>
         <li>
           <%= radio_button_tag "avatar_action", "delete" %>
           <label class='standard-label' for='avatar_action_delete'><%= t ".delete image" %></label>
         </li>
         <% end %>
-        <% if current_user.avatar.attached? || current_user.image.file? %>
+        <% if current_user.avatar.attached? %>
           <li>
             <%= radio_button_tag "avatar_action", "new" %>
             <label class='standard-label' for='avatar_action_new'>