Automatic merge of gitlab-org/gitlab-ce master

qa/qa/page/main/menu.rb

@@ -57,9 +57,13 @@ module QA
         end
 
         def go_to_profile_settings
+          with_retry(reload: false) do
             within_user_menu do
               click_link 'Settings'
             end
+
+            has_text?('User Settings')
+          end
         end
 
         def has_personal_area?(wait: Capybara.default_max_wait_time)