Merge branch 'move-has-ref-concern-to-ci' into 'master'

Move HasRef concern inside Ci namespace

See merge request gitlab-org/gitlab!27056

app/models/ci/bridge.rb

@@ -7,7 +7,7 @@ module Ci
     include Ci::Metadatable
     include Importable
     include AfterCommitQueue
-    include HasRef
+    include Ci::HasRef
 
     InvalidBridgeTypeError = Class.new(StandardError)
     InvalidTransitionError = Class.new(StandardError)

app/models/ci/build.rb

@@ -10,7 +10,7 @@ module Ci
     include ObjectStorage::BackgroundMove
     include Presentable
     include Importable
-    include HasRef
+    include Ci::HasRef
     include IgnorableColumns
 
     BuildArchivedError = Class.new(StandardError)

app/models/ci/pipeline.rb

@@ -11,7 +11,7 @@ module Ci
     include Gitlab::Utils::StrongMemoize
     include AtomicInternalId
     include EnumWithNil
-    include HasRef
+    include Ci::HasRef
     include ShaAttribute
     include FromUnion
     include UpdatedAtFilterable

app/models/concerns/ci/has_ref.rb

+# frozen_string_literal: true
+
+##
+# We will disable `ref` and `sha` attributes in `Ci::Build` in the future
+# and remove this module in favor of Ci::PipelineDelegator.
+module Ci
+  module HasRef
+    extend ActiveSupport::Concern
+
+    def branch?
+      !tag? && !merge_request?
+    end
+
+    def git_ref
+      if branch?
+        Gitlab::Git::BRANCH_REF_PREFIX + ref.to_s
+      elsif tag?
+        Gitlab::Git::TAG_REF_PREFIX + ref.to_s
+      end
+    end
+
+    # A slugified version of the build ref, suitable for inclusion in URLs and
+    # domain names. Rules:
+    #
+    #   * Lowercased
+    #   * Anything not matching [a-z0-9-] is replaced with a -
+    #   * Maximum length is 63 bytes
+    #   * First/Last Character is not a hyphen
+    def ref_slug
+      Gitlab::Utils.slugify(ref.to_s)
+    end
+  end
+end

app/models/concerns/has_ref.rb

-# frozen_string_literal: true
-
-##
-# We will disable `ref` and `sha` attributes in `Ci::Build` in the future
-# and remove this module in favor of Ci::PipelineDelegator.
-module HasRef
-  extend ActiveSupport::Concern
-
-  def branch?
-    !tag? && !merge_request?
-  end
-
-  def git_ref
-    if branch?
-      Gitlab::Git::BRANCH_REF_PREFIX + ref.to_s
-    elsif tag?
-      Gitlab::Git::TAG_REF_PREFIX + ref.to_s
-    end
-  end
-
-  # A slugified version of the build ref, suitable for inclusion in URLs and
-  # domain names. Rules:
-  #
-  #   * Lowercased
-  #   * Anything not matching [a-z0-9-] is replaced with a -
-  #   * Maximum length is 63 bytes
-  #   * First/Last Character is not a hyphen
-  def ref_slug
-    Gitlab::Utils.slugify(ref.to_s)
-  end
-end

spec/models/concerns/has_ref_spec.rb → spec/models/concerns/ci/has_ref_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe HasRef do
+describe Ci::HasRef do
   describe '#branch?' do
     let(:build) { create(:ci_build) }