Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 6 deletions

diff --git a/qa/qa/specs/features/api/1_manage/rate_limits_spec.rb b/qa/qa/specs/features/api/1_manage/rate_limits_spec.rb
index 44c5e0b4196..819739ac535 100644
--- a/qa/qa/specs/features/api/1_manage/rate_limits_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/rate_limits_spec.rb
@@ -3,11 +3,8 @@
 module QA
   context 'Manage with IP rate limits', :requires_admin do
     describe 'Users API' do
-      before(:context) do
-        @api_client = Runtime::API::Client.new(:gitlab, ip_limits: true)
-      end
-
-      let(:request) { Runtime::API::Request.new(@api_client, '/users') }
+      let(:api_client) { Runtime::API::Client.new(:gitlab, ip_limits: true) }
+      let(:request) { Runtime::API::Request.new(api_client, '/users') }
 
       it 'GET /users' do
         5.times do
diff --git a/qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb b/qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb
index ce8425cb3d1..ac5db53ad40 100644
--- a/qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb
+++ b/qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb
@@ -8,7 +8,7 @@ module QA
     describe 'Compare archives of different user projects with the same name and check they\'re different' do
       include Support::Api
 
-      before(:all) do
+      before do
         @project_name = "project-archive-download-#{SecureRandom.hex(8)}"
         @archive_types = %w(tar.gz tar.bz2 tar zip)
         @users = {