Add latest changes from gitlab-org/gitlab@master

4 files changed, 37 insertions, 2 deletions

diff --git a/qa/qa.rb b/qa/qa.rb
index cff6f9b9d56..205e6b82aec 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -259,6 +259,7 @@ module QA
       module Milestone
         autoload :New, 'qa/page/project/milestone/new'
         autoload :Index, 'qa/page/project/milestone/index'
+        autoload :Show, 'qa/page/project/milestone/show'
       end
 
       module Operations
@@ -449,6 +450,7 @@ module QA
       autoload :Logging, 'qa/support/page/logging'
     end
     autoload :Api, 'qa/support/api'
+    autoload :Dates, 'qa/support/dates'
     autoload :Waiter, 'qa/support/waiter'
     autoload :Retrier, 'qa/support/retrier'
   end
diff --git a/qa/qa/page/project/milestone/index.rb b/qa/qa/page/project/milestone/index.rb
index 8ad7689ce70..6895c44f72f 100644
--- a/qa/qa/page/project/milestone/index.rb
+++ b/qa/qa/page/project/milestone/index.rb
@@ -17,5 +17,3 @@ module QA
     end
   end
 end
-
-QA::Page::Project::Milestone::Index.prepend_if_ee('QA::EE::Page::Project::Milestone::Index')
diff --git a/qa/qa/page/project/milestone/show.rb b/qa/qa/page/project/milestone/show.rb
new file mode 100644
index 00000000000..a6ad76cb33b
--- /dev/null
+++ b/qa/qa/page/project/milestone/show.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Project
+      module Milestone
+        class Show < Page::Base
+        end
+      end
+    end
+  end
+end
+
+QA::Page::Project::Milestone::Show.prepend_if_ee('QA::EE::Page::Project::Milestone::Show')
diff --git a/qa/qa/support/dates.rb b/qa/qa/support/dates.rb
new file mode 100644
index 00000000000..47fc721afc1
--- /dev/null
+++ b/qa/qa/support/dates.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module QA
+  module Support
+    module Dates
+      def current_date_yyyy_mm_dd
+        current_date.strftime("%Y/%m/%d")
+      end
+
+      def next_month_yyyy_mm_dd
+        current_date.next_month.strftime("%Y/%m/%d")
+      end
+
+      private
+
+      def current_date
+        DateTime.now
+      end
+    end
+  end
+end