Merge branch 'master' into live

2025-05-14 18:58:38 +04:00
parent 208977177a 03be2e09e6
commit c6cb9caa6d
2 changed files with 0 additions and 4 deletions
--- a/app/views/settings/_profile.html.erb
+++ b/app/views/settings/_profile.html.erb
@@ -31,7 +31,6 @@
      <% end %>
    <% end %>

-    <% if Flipper.enabled?(:avatar_upload, current_user) %>
    <label class="block">
      <p class="font-bold mb-1">Avatar</p>
      <p class="text-gray-500">Default profile picture</p>
@@ -54,7 +53,6 @@
        </div>
      </div>
    </label>
-    <% end %>

    <p class="mt-8 pt-6 border-t border-gray-200 text-right">
      <%= f.submit 'Save', class: "btn-md btn-blue w-full md:w-auto" %>