Add latest changes from gitlab-org/gitlab@master

app/assets/stylesheets/framework/flash.scss

@@ -131,16 +131,16 @@ $notification-box-shadow-color: rgba(0, 0, 0, 0.25);
   }
 }
-.with-system-header .flash-container {
+.with-system-header .flash-container.sticky {
   top: $flash-container-top + $system-header-height;
 }
 .with-performance-bar {
-  .flash-container {
+  .flash-container.sticky {
     top: $flash-container-top + $performance-bar-height;
   }
-  &.with-system-header .flash-container {
+  &.with-system-header .flash-container.sticky {
     top: $flash-container-top + $performance-bar-height + $system-header-height;
   }
 }

app/assets/stylesheets/framework/highlight.scss

@@ -71,7 +71,7 @@
 }
 // Vertically aligns <table> line numbers (eg. blame view)
-// see https://gitlab.com/gitlab-org/gitlab-ce/issues/54048
+// see https://gitlab.com/gitlab-org/gitlab-foss/issues/54048
 td.line-numbers {
   line-height: 1;
 }

app/assets/stylesheets/mailers/highlighted_diff_email.scss

@@ -4,7 +4,7 @@
 // avoid all descendant selectors (`table td`). This is because the CSS inlining
 // we use performs dramatically worse on descendant selectors than the
 // alternatives.
-// <https://gitlab.com/gitlab-org/gitlab-ee/issues/490#note_12283632>
+// <https://gitlab.com/gitlab-org/gitlab/issues/490#note_12283632>
 //
 // DO NOT ADD ANY DESCENDANT SELECTORS TO THIS FILE. Instead, use (in order of
 // preference): plain class selectors, type (element name) selectors, or

app/assets/stylesheets/pages/boards.scss

@@ -73,7 +73,7 @@
 .board {
   // the next line cannot be replaced with .d-inline-block because it breaks display: none of SortableJS
-  // see https://gitlab.com/gitlab-org/gitlab-ce/issues/64828
+  // see https://gitlab.com/gitlab-org/gitlab-foss/issues/64828
   display: inline-block;
   width: calc(85vw - 15px);

app/assets/stylesheets/pages/commits.scss

@@ -81,7 +81,7 @@
   position: relative;
   font-family: $monospace-font;
   $left: 12px;
-  overflow: hidden; // See https://gitlab.com/gitlab-org/gitlab-ce/issues/13987
+  overflow: hidden; // See https://gitlab.com/gitlab-org/gitlab-foss/issues/13987
   .max-width-marker {
     width: 72ch;
     color: $commit-max-width-marker-color;

app/assets/stylesheets/pages/cycle_analytics.scss

-#cycle-analytics {
-  max-width: 1000px;
+#cycle-analytics,
+.cycle-analytics {
   margin: 24px auto 0;
   position: relative;
@@ -41,7 +41,8 @@
       width: 20%;
     }
-    .fa {
+    .fa,
+    svg {
       color: $cycle-analytics-light-gray;
       &:hover {
@@ -233,7 +234,7 @@
       &.issue-title,
       &.commit-title,
-      &.merge-merquest-title {
+      &.merge-request-title {
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
@@ -266,6 +267,7 @@
       color: $gl-text-color;
     }
+    .mr-link,
     .issue-link,
     .commit-author-link,
     .issue-author-link {

app/assets/stylesheets/pages/issuable.scss

@@ -571,7 +571,7 @@
     /*
      * Overwrite hover style for dropdown items, so that they are not blue
-     * This should be removed during dev of https://gitlab.com/gitlab-org/gitlab-ce/issues/44040
+     * This should be removed during dev of https://gitlab.com/gitlab-org/gitlab-foss/issues/44040
      */
     li a {
       &:hover,

app/assets/stylesheets/pages/notes.scss

@@ -492,7 +492,7 @@ $note-form-margin-left: 72px;
         vertical-align: top;
         white-space: normal;
-        // Fixes subpixel rounding issue https://gitlab.com/gitlab-org/gitlab-ce/issues/53973
+        // Fixes subpixel rounding issue https://gitlab.com/gitlab-org/gitlab-foss/issues/53973
         // background-color is needed for dark code preference
         padding-bottom: 1px;
         background-color: $white-light;
@@ -980,7 +980,7 @@ $note-form-margin-left: 72px;
 }
 //This needs to be deleted when Snippet/Commit comments are convered to Vue
-// See https://gitlab.com/gitlab-org/gitlab-ce/issues/53918#note_117038785
+// See https://gitlab.com/gitlab-org/gitlab-foss/issues/53918#note_117038785
 .unstyled-comments {
   .discussion-header {
     padding: $gl-padding;

app/assets/stylesheets/pages/pipelines.scss

@@ -453,7 +453,7 @@
   display: flex;
   width: 100%;
   background-color: $gray-light;
-  padding: $gl-padding;
+  padding: $gl-padding 0;
   overflow: auto;
 }

app/controllers/admin/application_settings_controller.rb

@@ -69,7 +69,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
   end
   def whitelist_query_limiting
-    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/63107')
+    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/63107')
   end
   def application_setting_params
@@ -86,7 +86,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
     params[:application_setting][:import_sources]&.delete("")
     params[:application_setting][:restricted_visibility_levels]&.delete("")
-    # TODO Remove domain_blacklist_raw in APIv5 (See https://gitlab.com/gitlab-org/gitlab-ce/issues/67204)
+    # TODO Remove domain_blacklist_raw in APIv5 (See https://gitlab.com/gitlab-org/gitlab-foss/issues/67204)
     params.delete(:domain_blacklist_raw) if params[:domain_blacklist_file]
     params.delete(:domain_blacklist_raw) if params[:domain_blacklist]
     params.delete(:domain_whitelist_raw) if params[:domain_whitelist]

app/controllers/admin/clusters_controller.rb

@@ -11,3 +11,5 @@ class Admin::ClustersController < Clusters::ClustersController
     @clusterable ||= InstanceClusterablePresenter.fabricate(Clusters::Instance.new, current_user: current_user)
   end
 end
+
+Admin::ClustersController.prepend_if_ee('EE::Admin::ClustersController')

app/controllers/admin/services_controller.rb

@@ -46,6 +46,6 @@ class Admin::ServicesController < Admin::ApplicationController
   # rubocop: enable CodeReuse/ActiveRecord
   def whitelist_query_limiting
-    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42430')
+    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/42430')
   end
 end

app/controllers/boards/issues_controller.rb

@@ -130,8 +130,8 @@ module Boards
     end
     def whitelist_query_limiting
-      # Also see https://gitlab.com/gitlab-org/gitlab-ce/issues/42439
-      Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42428')
+      # Also see https://gitlab.com/gitlab-org/gitlab-foss/issues/42439
+      Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/42428')
     end
     def validate_id_list

app/controllers/boards/lists_controller.rb

@@ -25,7 +25,7 @@ module Boards
     end
     def update
-      list = board.lists.movable.find(params[:id])
+      list = board.lists.find(params[:id])
       service = Boards::Lists::UpdateService.new(board_parent, current_user, update_list_params)
       result = service.execute(list)

app/controllers/clusters/clusters_controller.rb

@@ -31,7 +31,7 @@ class Clusters::ClustersController < Clusters::BaseController
     # In EE (Premium) we can have any number, as multiple clusters are
     # supported, but the number of clusters are fairly low currently.
     #
-    # See https://gitlab.com/gitlab-org/gitlab-ce/issues/55260 also.
+    # See https://gitlab.com/gitlab-org/gitlab-foss/issues/55260 also.
     @clusters = Kaminari.paginate_array(clusters).page(params[:page]).per(20)
     @has_ancestor_clusters = finder.has_ancestor_clusters?

app/controllers/concerns/record_user_last_activity.rb

@@ -6,7 +6,7 @@
 # for any authenticated GET request. The DB update will only happen once per day.
 #
 # In order to determine if you should include this concern or not, please check the
-# description and discussion on this issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/54947
+# description and discussion on this issue: https://gitlab.com/gitlab-org/gitlab-foss/issues/54947
 module RecordUserLastActivity
   include CookiesHelper
   extend ActiveSupport::Concern

app/controllers/dashboard/milestones_controller.rb

@@ -28,7 +28,7 @@ class Dashboard::MilestonesController < Dashboard::ApplicationController
     DashboardGroupMilestone.build_collection(groups, params)
   end
-  # See [#39545](https://gitlab.com/gitlab-org/gitlab-ce/issues/39545) for info about the deprecation of dynamic milestones
+  # See [#39545](https://gitlab.com/gitlab-org/gitlab-foss/issues/39545) for info about the deprecation of dynamic milestones
   def dynamic_milestones
     DashboardMilestone.build_collection(@projects, params)
   end

app/controllers/dashboard/projects_controller.rb

@@ -55,7 +55,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
   end
   def render_projects
-    # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/40260
+    # n+1: https://gitlab.com/gitlab-org/gitlab-foss/issues/40260
     Gitlab::GitalyClient.allow_n_plus_1_calls do
       render
     end

app/controllers/dashboard/todos_controller.rb

@@ -84,7 +84,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController
   end
   def todos_page_count(todos)
-    if todo_params.except(:sort, :page).empty? # rubocop: disable CodeReuse/ActiveRecord
+    if todo_params.except(:sort, :page).empty?
       (current_user.todos_pending_count.to_f / todos.limit_value).ceil
     else
       todos.total_pages

app/controllers/groups/runners_controller.rb

@@ -2,7 +2,7 @@
 class Groups::RunnersController < Groups::ApplicationController
   # Proper policies should be implemented per
-  # https://gitlab.com/gitlab-org/gitlab-ce/issues/45894
+  # https://gitlab.com/gitlab-org/gitlab-foss/issues/45894
   before_action :authorize_admin_group!
   before_action :runner, only: [:edit, :update, :destroy, :pause, :resume, :show]