merge dev and resolve conflicts

config/locales/crowdin/js-lol.yml

@@ -691,8 +691,8 @@ lol:
         days: crwdns107996:0crwdne107996:0
         weeks: crwdns107998:0crwdne107998:0
         months: crwdns108000:0crwdne108000:0
-      label_switch_to_single_select: crwdns111750:0crwdne111750:0
-      label_switch_to_multi_select: crwdns111752:0crwdne111752:0
+      label_switch_to_single_select: crwdns111942:0crwdne111942:0
+      label_switch_to_multi_select: crwdns111944:0crwdne111944:0
     toolbar:
       settings:
         configure_view: crwdns108002:0crwdne108002:0

config/locales/crowdin/lol.yml

@@ -2583,7 +2583,7 @@ lol:
     revoke_my_application_confirmation: Do you really want to remove this application?
       This will revoke %{token_count} active for it.
     my_registered_applications: Registered OAuth applications
-  button_remove_widget: crwdns111742:0crwdne111742:0
-  label_my_page_block: crwdns111744:0crwdne111744:0
-  label_responsible_for_work_packages: crwdns111746:0crwdne111746:0
-  label_visible_elements: crwdns111748:0crwdne111748:0
+  button_remove_widget: crwdns111934:0crwdne111934:0
+  label_my_page_block: crwdns111936:0crwdne111936:0
+  label_responsible_for_work_packages: crwdns111938:0crwdne111938:0
+  label_visible_elements: crwdns111940:0crwdne111940:0

spec/features/search_spec.rb

@@ -62,7 +62,6 @@ describe 'Search', type: :feature, js: true do
   end
 
   describe 'autocomplete' do
-
     let!(:other_work_package) { FactoryBot.create(:work_package, subject: 'Other work package', project: project) }
 
     it 'provides suggestions' do
@@ -111,6 +110,7 @@ describe 'Search', type: :feature, js: true do
                           results_selector: '.search-autocomplete--results')
       expect(current_path).to match(/\/search/)
       expect(current_url).to match(/\/search\?q=#{query}&work_packages=1&scope=all$/)
+
     end
   end