Merge branch 'master' into 48746-fix-files-uploaded-in-base64

app/views/projects/project_members/_team.html.haml

@@ -14,5 +14,5 @@
           %button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
             = icon("search")
         = render 'shared/members/sort_dropdown'
-  %ul.content-list.members-list
+  %ul.content-list.members-list.qa-members-list
     = render partial: 'shared/members/member', collection: members, as: :member

changelogs/unreleased/22311-fix-duplicated-key-in-license-management-job.yml

+---
+title: "fix duplicated key in license management job auto devops gitlab ci template"
+merge_request: 22311
+author: Adam Lemanski
+type: fixed

changelogs/unreleased/48684-sort-projects-by-stars-in-groups.yml

+---
+title: Add new sort option "most_stars" to "Group > Children" pages
+merge_request: 22121
+author: Rene Hennig

changelogs/unreleased/48889-message-for-were-merged-into.yml

+---
+title: Fix 'merged with' UI being displayed when merge request has no merge commit
+merge_request: 22022
+author:
+type: fixed

changelogs/unreleased/50185-fix-broken-file-name-navigation.yml

+---
+title: Fix broken file name navigation on MRs
+merge_request: 22109
+author:
+type: fixed

changelogs/unreleased/52361-fix-file-tree-mobile.yml

+---
+title: Improve MR file tree in smaller screens
+merge_request: 22273
+author:
+type: fixed

changelogs/unreleased/52421-show-canary-no-canary-in-the-performance-bar.yml

+---
+title: Show canary status in the performance bar
+merge_request: 22222
+author:
+type: changed

changelogs/unreleased/52472-pipeline-endpoint-json.yml

+---
+title: Fix caching issue with pipelines URL
+merge_request: 22293
+author:
+type: fixed

changelogs/unreleased/52519-runners-link.yml

+---
+title: Fixes stuck block URL linking to documentation instead of settings page
+merge_request: 22286
+author:
+type: fixed

changelogs/unreleased/52570-erased-block.yml

+---
+title: Fix erased block not being rendered when job was erased
+merge_request: 22294
+author:
+type: fixed

changelogs/unreleased/52608-sidebar.yml

+---
+title: Hides sidebar for job page in mobile
+merge_request:
+author:
+type: fixed

changelogs/unreleased/52614-update-job-started-check.yml

+---
+title: Fixes triggered/created labeled in job header
+merge_request:
+author:
+type: fixed

changelogs/unreleased/52618-incorrect-stage-being-shown-in-side-bar-of-job-view-api.yml

+---
+title: Load correct stage in the stages dropdown
+merge_request: 22317
+author:
+type: fixed

changelogs/unreleased/enable-frozen-string-lib-gitlab.yml

+---
+title: Enable some frozen string in lib/gitlab
+merge_request:
+author: gfyoung
+type: performance

changelogs/unreleased/even-more-frozen-string-lib.yml

+---
+title: Enable even more frozen string in lib/**/*.rb
+merge_request:
+author: gfyoung
+type: performance

changelogs/unreleased/feature-improved-branch-filter-sorting.yml

+---
+title: Improving branch filter sorting by listing exact matches first and added support
+  for begins_with (^) and ends_with ($) matching.
+merge_request: 22166
+author: Jason Rutherford
+type: changed

changelogs/unreleased/fl-update-svgs.yml

+---
+title: Updates svg dependency
+merge_request:
+author:
+type: other

changelogs/unreleased/gt-update-application-copy-secret-to-clipboard-data.yml

+---
+title: Update copy to clipboard button data for application secret
+merge_request: 22268
+author: George Tsiolis
+type: fixed

changelogs/unreleased/sh-fix-project-deletion-with-export.yml

+---
+title: Fix project deletion when there is a export available
+merge_request: 22276
+author:
+type: fixed

config/unicorn.rb.example

@@ -95,7 +95,7 @@ end
 before_fork do |server, worker|
   # the following is highly recommended for Rails + "preload_app true"
   # as there's no need for the master process to hold a connection
-  defined?(ActiveRecord::Base) and
+  defined?(ActiveRecord::Base) &&
     ActiveRecord::Base.connection.disconnect!
   # The following is only recommended for memory/DB-constrained
@@ -133,7 +133,7 @@ after_fork do |server, worker|
   # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true)
   # the following is *required* for Rails + "preload_app true",
-  defined?(ActiveRecord::Base) and
+  defined?(ActiveRecord::Base) &&
     ActiveRecord::Base.establish_connection
   # reset prometheus client, this will cause any opened metrics files to be closed