Add latest changes from gitlab-org/gitlab@master

6 files changed, 14 insertions, 7 deletions

diff --git a/app/controllers/projects/usage_quotas_controller.rb b/app/controllers/projects/usage_quotas_controller.rb
index dfca289ef71..7037cf8811a 100644
--- a/app/controllers/projects/usage_quotas_controller.rb
+++ b/app/controllers/projects/usage_quotas_controller.rb
@@ -6,10 +6,6 @@ module Projects
 
     layout "project_settings"
 
-    before_action do
-      push_frontend_feature_flag(:move_year_dropdown_usage_charts, current_user)
-    end
-
     feature_category :consumables_cost_management
     urgency :low
 
diff --git a/app/models/ci/build_trace.rb b/app/models/ci/build_trace.rb
index f70e1ed69ea..b9a74102641 100644
--- a/app/models/ci/build_trace.rb
+++ b/app/models/ci/build_trace.rb
@@ -12,7 +12,11 @@ module Ci
 
       if stream.valid?
         stream.limit
-        @trace = Gitlab::Ci::Ansi2json.convert(stream.stream, state)
+        @trace = Gitlab::Ci::Ansi2json.convert(
+          stream.stream,
+          state,
+          verify_state: Feature.enabled?(:sign_and_verify_ansi2json_state, build.project)
+        )
       end
     end
 
diff --git a/app/models/resource_milestone_event.rb b/app/models/resource_milestone_event.rb
index f3301ee2051..61129bbc9d8 100644
--- a/app/models/resource_milestone_event.rb
+++ b/app/models/resource_milestone_event.rb
@@ -4,6 +4,9 @@ class ResourceMilestoneEvent < ResourceTimeboxEvent
   belongs_to :milestone
 
   scope :include_relations, -> { includes(:user, milestone: [:project, :group]) }
+  scope :aliased_for_timebox_report, -> do
+    select("'timebox' AS event_type", "id", "created_at", "milestone_id AS value", "action", "issue_id")
+  end
 
   # state is used for issue and merge request states.
   enum state: Issue.available_states.merge(MergeRequest.available_states)
diff --git a/app/models/resource_state_event.rb b/app/models/resource_state_event.rb
index 134f71e35ad..e2ac762b1cd 100644
--- a/app/models/resource_state_event.rb
+++ b/app/models/resource_state_event.rb
@@ -13,6 +13,10 @@ class ResourceStateEvent < ResourceEvent
 
   after_create :issue_usage_metrics
 
+  scope :aliased_for_timebox_report, -> do
+    select("'state' AS event_type", "id", "created_at", "state AS value", "NULL AS action", "issue_id")
+  end
+
   def self.issuable_attrs
     %i(issue merge_request).freeze
   end
diff --git a/app/views/protected_branches/shared/_branches_list.html.haml b/app/views/protected_branches/shared/_branches_list.html.haml
index 8235411d240..ed2d420ffcd 100644
--- a/app/views/protected_branches/shared/_branches_list.html.haml
+++ b/app/views/protected_branches/shared/_branches_list.html.haml
@@ -26,7 +26,7 @@
           %th
             = s_("ProtectedBranch|Allowed to force push")
             %span.has-tooltip{ data: { container: 'body' }, title: s_('ProtectedBranch|Allow all users with push access to force push.'), 'aria-hidden': 'true' }
-              = sprite_icon('question', size: 16, css_class: 'gl-text-gray-500')
+              = sprite_icon('question-o', size: 16, css_class: 'gl-text-blue-500')
 
           = render_if_exists 'protected_branches/ee/code_owner_approval_table_head', protected_branch_entity: protected_branch_entity
 
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 16d79a4ff72..28f9a6a6336 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -116,7 +116,7 @@
                 - if @user.website_url.present?
                   = render 'middle_dot_divider', stacking: true do
                     - if Feature.enabled?(:security_auto_fix) && @user.bot?
-                      = sprite_icon('question', css_class: 'gl-text-blue-600')
+                      = sprite_icon('question-o', css_class: 'gl-text-blue-500')
                     = link_to @user.short_website_url, @user.full_website_url, target: '_blank', rel: 'me noopener noreferrer nofollow', itemprop: 'url'
                 - if display_public_email?(@user)
                   = render 'middle_dot_divider', stacking: true do