Merge branch 'qa/gb/tmp-fix-mattermost-failures' into 'master'

Implement a workaround for QA mattermost failures

Closes gitlab-qa#102

See merge request gitlab-org/gitlab-ce!15486

qa/qa/specs/features/mattermost/login_spec.rb

@@ -9,5 +9,16 @@ module QA
         expect(page).to have_content(/(Welcome to: Mattermost|Logout GitLab Mattermost)/)
       end
     end
+
+    ##
+    # TODO, temporary workaround for gitlab-org/gitlab-qa#102.
+    #
+    after do
+      visit Runtime::Scenario.mattermost_address
+      reset_session!
+
+      visit Runtime::Scenario.gitlab_address
+      reset_session!
+    end
   end
 end