Add latest changes from gitlab-org/gitlab@master

2 files changed, 31 insertions, 16 deletions

diff --git a/lib/gitlab/cycle_analytics/summary/base.rb b/lib/gitlab/cycle_analytics/summary/base.rb
index f867dbd4d68..5605d48c543 100644
--- a/lib/gitlab/cycle_analytics/summary/base.rb
+++ b/lib/gitlab/cycle_analytics/summary/base.rb
@@ -4,27 +4,13 @@ module Gitlab
   module CycleAnalytics
     module Summary
       class Base
+        include Gitlab::CycleAnalytics::Summary::Defaults
+
         def initialize(project:, options:)
           @project = project
           @options = options
         end
 
-        def identifier
-          self.class.name.demodulize.underscore.to_sym
-        end
-
-        def title
-          raise NotImplementedError, "Expected #{self.name} to implement title"
-        end
-
-        def value
-          raise NotImplementedError, "Expected #{self.name} to implement value"
-        end
-
-        def links
-          []
-        end
-
         private
 
         attr_reader :project, :options
diff --git a/lib/gitlab/cycle_analytics/summary/defaults.rb b/lib/gitlab/cycle_analytics/summary/defaults.rb
new file mode 100644
index 00000000000..468494a8ab8
--- /dev/null
+++ b/lib/gitlab/cycle_analytics/summary/defaults.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module CycleAnalytics
+    module Summary
+      module Defaults
+        def identifier
+          self.class.name.demodulize.underscore.to_sym
+        end
+
+        # :nocov: the class including this concern is expected to test this method.
+        def title
+          raise NotImplementedError, "Expected #{self.name} to implement title"
+        end
+        # :nocov:
+
+        # :nocov: the class including this concern is expected to test this method.
+        def value
+          raise NotImplementedError, "Expected #{self.name} to implement value"
+        end
+        # :nocov:
+
+        def links
+          []
+        end
+      end
+    end
+  end
+end