Add latest changes from gitlab-org/gitlab@master

6 files changed, 23 insertions, 32 deletions

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 1d68dccc741..bd8c33d27d5 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -35,17 +35,15 @@ module IssuesHelper
     end
   end
 
-  def status_box_class(item)
+  def status_box_variant(item)
     if item.try(:expired?)
-      'gl-bg-orange-500'
-    elsif item.try(:merged?)
-      'badge-info'
+      'warning'
     elsif item.closed?
-      item.is_a?(MergeRequest) ? 'badge-danger' : 'gl-bg-red-500'
+      'danger'
     elsif item.try(:upcoming?)
-      'gl-bg-gray-500'
+      'neutral'
     else
-      item.is_a?(MergeRequest) ? 'badge-success' : 'gl-bg-green-500'
+      'success'
     end
   end
 
diff --git a/app/helpers/timeboxes_helper.rb b/app/helpers/timeboxes_helper.rb
index 307f03e0d64..7d013dd74dc 100644
--- a/app/helpers/timeboxes_helper.rb
+++ b/app/helpers/timeboxes_helper.rb
@@ -8,7 +8,7 @@ module TimeboxesHelper
     if milestone.closed?
       _('Closed')
     elsif milestone.expired?
-      _('Past due')
+      _('Expired')
     elsif milestone.upcoming?
       _('Upcoming')
     else
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index 8ff7fe6da71..95ef856daba 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -3,6 +3,7 @@
 - page_title       @milestone.title, _('Milestones')
 - page_description @milestone.description_html
 - add_page_specific_style 'page_bundles/milestone'
+- add_page_specific_style 'page_bundles/issuable'
 
 - add_page_startup_api_call milestone_tab_path(@milestone, 'issues', show_project_name: false)
 
diff --git a/app/views/shared/milestones/_header.html.haml b/app/views/shared/milestones/_header.html.haml
index 334785685d5..1d5f282dcf9 100644
--- a/app/views/shared/milestones/_header.html.haml
+++ b/app/views/shared/milestones/_header.html.haml
@@ -1,7 +1,6 @@
 .detail-page-header.milestone-page-header
-  .status-box{ class: status_box_class(milestone) }
+  = render Pajamas::BadgeComponent.new(variant: status_box_variant(milestone), class: 'gl-mr-3') do
     = milestone_status_string(milestone)
-
   .header-text-content
     %span.identifier
       %strong
diff --git a/spec/features/milestone_spec.rb b/spec/features/milestone_spec.rb
index 50cd6b9e801..61098a8f2cd 100644
--- a/spec/features/milestone_spec.rb
+++ b/spec/features/milestone_spec.rb
@@ -128,8 +128,8 @@ RSpec.describe 'Milestone', feature_category: :team_planning do
 
         click_link 'Reopen Milestone'
 
-        expect(page).not_to have_selector('.gl-bg-red-500')
-        expect(page).to have_selector('.gl-bg-green-500')
+        expect(page).not_to have_selector('.badge-danger')
+        expect(page).to have_selector('.badge-success')
       end
     end
 
@@ -139,8 +139,8 @@ RSpec.describe 'Milestone', feature_category: :team_planning do
 
         click_link 'Reopen Milestone'
 
-        expect(page).not_to have_selector('.gl-bg-red-500')
-        expect(page).to have_selector('.gl-bg-green-500')
+        expect(page).not_to have_selector('.badge-danger')
+        expect(page).to have_selector('.badge-success')
       end
     end
   end
diff --git a/spec/helpers/issues_helper_spec.rb b/spec/helpers/issues_helper_spec.rb
index ed363268cdf..e867b8e131e 100644
--- a/spec/helpers/issues_helper_spec.rb
+++ b/spec/helpers/issues_helper_spec.rb
@@ -472,39 +472,32 @@ RSpec.describe IssuesHelper do
     end
   end
 
-  describe '#status_box_class' do
+  describe '#status_box_variant' do
     context 'when object is expired' do
-      it 'returns orange background' do
+      it 'returns warning badge' do
         milestone = build(:milestone, due_date: Date.today.prev_month)
-        expect(helper.status_box_class(milestone)).to eq('gl-bg-orange-500')
-      end
-    end
-
-    context 'when object is merged' do
-      it 'returns blue background' do
-        merge_request = build(:merge_request, :merged)
-        expect(helper.status_box_class(merge_request)).to eq('badge-info')
+        expect(helper.status_box_variant(milestone)).to eq('warning')
       end
     end
 
     context 'when object is closed' do
-      it 'returns red background' do
-        merge_request = build(:merge_request, :closed)
-        expect(helper.status_box_class(merge_request)).to eq('badge-danger')
+      it 'returns danger badge' do
+        milestone = build(:milestone, :closed)
+        expect(helper.status_box_variant(milestone)).to eq('danger')
       end
     end
 
     context 'when object is upcoming' do
-      it 'returns gray background' do
+      it 'returns neutral badge' do
         milestone = build(:milestone, start_date: Date.today.next_month)
-        expect(helper.status_box_class(milestone)).to eq('gl-bg-gray-500')
+        expect(helper.status_box_variant(milestone)).to eq('neutral')
       end
     end
 
     context 'when object is opened' do
-      it 'returns green background' do
-        merge_request = build(:merge_request, :opened)
-        expect(helper.status_box_class(merge_request)).to eq('badge-success')
+      it 'returns success badge' do
+        milestone = build(:milestone)
+        expect(helper.status_box_variant(milestone)).to eq('success')
       end
     end
   end