Merge branch 'master' into fl-eslint-vue-house-keeping

* master:
  Don't use Rails.root.join for upload fixture paths
  Fix translation placeholder for Gitaly address
  Revert extra CSS causing Gitaly Servers table to be misalgined
  Fix conversion of integer into string in board spec

7 files changed, 21 insertions, 12 deletions

diff --git a/app/views/admin/gitaly_servers/index.html.haml b/app/views/admin/gitaly_servers/index.html.haml
index d0cf5761726..9b24f411a75 100644
--- a/app/views/admin/gitaly_servers/index.html.haml
+++ b/app/views/admin/gitaly_servers/index.html.haml
@@ -6,10 +6,10 @@
   - if @gitaly_servers.any?
     .table-holder
       %table.table.responsive-table
-        %thead.d-none.d-sm-none.d-md-block
+        %thead
           %tr
             %th= _("Storage")
-            %th= n_("Gitaly|Address")
+            %th= s_("Gitaly|Address")
             %th= _("Server version")
             %th= _("Git version")
             %th= _("Up to date")
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 946669068cd..058a02833b1 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -2249,6 +2249,9 @@ msgstr ""
 msgid "Gitaly"
 msgstr ""
 
+msgid "Gitaly|Address"
+msgstr ""
+
 msgid "Gitaly Servers"
 msgstr ""
 
diff --git a/spec/controllers/boards/lists_controller_spec.rb b/spec/controllers/boards/lists_controller_spec.rb
index 71d45a22d91..57ccbf1d6b5 100644
--- a/spec/controllers/boards/lists_controller_spec.rb
+++ b/spec/controllers/boards/lists_controller_spec.rb
@@ -156,12 +156,18 @@ describe Boards::ListsController do
     def move(user:, board:, list:, position:)
       sign_in(user)
 
-      patch :update, namespace_id: project.namespace.to_param,
-                     project_id: project,
-                     board_id: board.to_param,
-                     id: list.to_param,
-                     list: { position: position },
-                     format: :json
+      params = { namespace_id: project.namespace.to_param,
+                 project_id: project,
+                 board_id: board.to_param,
+                 id: list.to_param,
+                 list: { position: position },
+                 format: :json }
+
+      if Gitlab.rails5?
+        patch :update, params: params, as: :json
+      else
+        patch :update, params
+      end
     end
   end
 
diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb
index 3230d7b438f..1df2c954893 100644
--- a/spec/controllers/uploads_controller_spec.rb
+++ b/spec/controllers/uploads_controller_spec.rb
@@ -562,7 +562,7 @@ describe UploadsController do
     end
 
     context 'original filename or a version filename must match' do
-      let!(:appearance) { create :appearance, favicon: fixture_file_upload(Rails.root.join('spec/fixtures/dk.png'), 'image/png') }
+      let!(:appearance) { create :appearance, favicon: fixture_file_upload('spec/fixtures/dk.png', 'image/png') }
 
       context 'has a valid filename on the original file' do
         it 'successfully returns the file' do
diff --git a/spec/lib/gitlab/favicon_spec.rb b/spec/lib/gitlab/favicon_spec.rb
index fdc5c0180e4..08c4a474217 100644
--- a/spec/lib/gitlab/favicon_spec.rb
+++ b/spec/lib/gitlab/favicon_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe Gitlab::Favicon, :request_store do
     end
 
     it 'uses the custom favicon if a favicon appearance is present' do
-      create :appearance, favicon: fixture_file_upload(Rails.root.join('spec/fixtures/dk.png'))
+      create :appearance, favicon: fixture_file_upload('spec/fixtures/dk.png')
       expect(described_class.main).to match %r{/uploads/-/system/appearance/favicon/\d+/favicon_main_dk.png}
     end
   end
diff --git a/spec/models/project_services/jira_service_spec.rb b/spec/models/project_services/jira_service_spec.rb
index c3b4eb17a5c..b9f1c7dd5df 100644
--- a/spec/models/project_services/jira_service_spec.rb
+++ b/spec/models/project_services/jira_service_spec.rb
@@ -475,7 +475,7 @@ describe JiraService do
     end
 
     it 'includes returns the custom favicon' do
-      create :appearance, favicon: fixture_file_upload(Rails.root.join('spec/fixtures/dk.png'))
+      create :appearance, favicon: fixture_file_upload('spec/fixtures/dk.png')
 
       props = described_class.new.send(:build_remote_link_props, url: 'http://example.com', title: 'title')
       expect(props[:object][:icon][:url16x16]).to match %r{^http://localhost/uploads/-/system/appearance/favicon/\d+/favicon_main_dk.png$}
diff --git a/spec/uploaders/favicon_uploader_spec.rb b/spec/uploaders/favicon_uploader_spec.rb
index db8a3207f4d..37deea8ab90 100644
--- a/spec/uploaders/favicon_uploader_spec.rb
+++ b/spec/uploaders/favicon_uploader_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe FaviconUploader do
   end
 
   def upload_fixture(filename)
-    fixture_file_upload(Rails.root.join('spec', 'fixtures', filename))
+    fixture_file_upload("spec/fixtures/#{filename}")
   end
 
   context 'versions' do