Merge branch 'master' into live

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" %>

spec/features/settings/profile_spec.rb

@@ -5,8 +5,6 @@ RSpec.describe 'Profile settings', type: :feature do
   let(:avatar_jpeg) { File.binread("#{Rails.root}/spec/fixtures/files/taipei.jpg") }
 
   before do
-    Flipper.enable "avatar_upload"
-
     login_as user, :scope => :user
     allow(user).to receive(:display_name).and_return("Mark")