Automatic merge of gitlab-org/gitlab-ce master

app/assets/stylesheets/pages/builds.scss

@@ -134,6 +134,7 @@
   .build-loader-animation {
     @include build-loader-animation;
     float: left;
+    padding-left: $gl-padding-8;
   }
 }
 

changelogs/unreleased/52620-fix-loader-animation-alignment.yml

+---
+title: Aligns build loader animation with the job log
+merge_request: 23959
+author:
+type: fixed

changelogs/unreleased/fix-55448.yml

+---
+title: Remove deprecated xhr from specs
+merge_request: 23949
+author: Jasper Maes
+type: other

spec/controllers/groups/group_members_controller_spec.rb

@@ -86,9 +86,11 @@ describe Groups::GroupMembersController do
 
     Gitlab::Access.options.each do |label, value|
       it "can change the access level to #{label}" do
-        xhr :put, :update, group_member: { access_level: value },
-                           group_id: group,
-                           id: requester
+        put :update, params: {
+          group_member: { access_level: value },
+          group_id: group,
+          id: requester
+        }, xhr: true
 
         expect(requester.reload.human_access).to eq(label)
       end
@@ -138,7 +140,7 @@ describe Groups::GroupMembersController do
         end
 
         it '[JS] removes user from members' do
-          xhr :delete, :destroy, group_id: group, id: member
+          delete :destroy, params: { group_id: group, id: member }, xhr: true
 
           expect(response).to be_success
           expect(group.members).not_to include member

spec/controllers/projects/issues_controller_spec.rb

@@ -206,12 +206,12 @@ describe Projects::IssuesController do
   describe 'Redirect after sign in' do
     context 'with an AJAX request' do
       it 'does not store the visited URL' do
-        xhr :get,
-          :show,
+        get :show, params: {
           format: :json,
           namespace_id: project.namespace,
           project_id: project,
           id: issue.iid
+        }, xhr: true
 
         expect(session['user_return_to']).to be_blank
       end

spec/controllers/projects/merge_requests_controller_spec.rb

@@ -333,7 +333,7 @@ describe Projects::MergeRequestsController do
 
       before do
         project.add_reporter(user)
-        xhr :post, :merge, params: base_params
+        post :merge, params: base_params, xhr: true
       end
 
       it 'returns 404' do
@@ -681,13 +681,14 @@ describe Projects::MergeRequestsController do
       merge_request.title = merge_request.wip_title
       merge_request.save
 
-      xhr :post, :remove_wip,
-        format: :json,
+      post :remove_wip,
         params: {
+          format: :json,
           namespace_id: merge_request.project.namespace.to_param,
           project_id: merge_request.project,
           id: merge_request.iid
-        }
+        },
+        xhr: true
     end
 
     it 'removes the wip status' do
@@ -701,13 +702,14 @@ describe Projects::MergeRequestsController do
 
   describe 'POST cancel_merge_when_pipeline_succeeds' do
     subject do
-      xhr :post, :cancel_merge_when_pipeline_succeeds,
-        format: :json,
+      post :cancel_merge_when_pipeline_succeeds,
         params: {
+          format: :json,
           namespace_id: merge_request.project.namespace.to_param,
           project_id: merge_request.project,
           id: merge_request.iid
-        }
+        },
+        xhr: true
     end
 
     it 'calls MergeRequests::MergeWhenPipelineSucceedsService' do

spec/controllers/projects/project_members_controller_spec.rb

@@ -82,10 +82,12 @@ describe Projects::ProjectMembersController do
 
     Gitlab::Access.options.each do |label, value|
       it "can change the access level to #{label}" do
-        xhr :put, :update, project_member: { access_level: value },
-                           namespace_id: project.namespace,
-                           project_id: project,
-                           id: requester
+        put :update, params: {
+          project_member: { access_level: value },
+          namespace_id: project.namespace,
+          project_id: project,
+          id: requester
+        }, xhr: true
 
         expect(requester.reload.human_access).to eq(label)
       end
@@ -148,9 +150,11 @@ describe Projects::ProjectMembersController do
         end
 
         it '[JS] removes user from members' do
-          xhr :delete, :destroy, namespace_id: project.namespace,
-                                 project_id: project,
-                                 id: member
+          delete :destroy, params: {
+            namespace_id: project.namespace,
+            project_id: project,
+            id: member
+          }, xhr: true
 
           expect(response).to be_success
           expect(project.members).not_to include member

spec/controllers/projects/refs_controller_spec.rb

@@ -22,13 +22,13 @@ describe Projects::RefsController do
     end
 
     def xhr_get(format = :html)
-      xhr :get,
-          :logs_tree,
-          namespace_id: project.namespace.to_param,
-          project_id: project,
-          id: 'master',
-          path: 'foo/bar/baz.html',
-          format: format
+      get :logs_tree, params: {
+        namespace_id: project.namespace.to_param,
+        project_id: project,
+        id: 'master',
+        path: 'foo/bar/baz.html',
+        format: format
+      }, xhr: true
     end
 
     it 'never throws MissingTemplate' do