Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e2a902a9
Commit
e2a902a9
authored
Mar 13, 2020
by
Fabio Pitino
Committed by
Grzegorz Bizon
Mar 13, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move HasRef concern inside Ci namespace
parent
c146461e
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
37 additions
and
35 deletions
+37
-35
app/models/ci/bridge.rb
app/models/ci/bridge.rb
+1
-1
app/models/ci/build.rb
app/models/ci/build.rb
+1
-1
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+1
-1
app/models/concerns/ci/has_ref.rb
app/models/concerns/ci/has_ref.rb
+33
-0
app/models/concerns/has_ref.rb
app/models/concerns/has_ref.rb
+0
-31
spec/models/concerns/ci/has_ref_spec.rb
spec/models/concerns/ci/has_ref_spec.rb
+1
-1
No files found.
app/models/ci/bridge.rb
View file @
e2a902a9
...
@@ -7,7 +7,7 @@ module Ci
...
@@ -7,7 +7,7 @@ module Ci
include
Ci
::
Metadatable
include
Ci
::
Metadatable
include
Importable
include
Importable
include
AfterCommitQueue
include
AfterCommitQueue
include
HasRef
include
Ci
::
HasRef
InvalidBridgeTypeError
=
Class
.
new
(
StandardError
)
InvalidBridgeTypeError
=
Class
.
new
(
StandardError
)
InvalidTransitionError
=
Class
.
new
(
StandardError
)
InvalidTransitionError
=
Class
.
new
(
StandardError
)
...
...
app/models/ci/build.rb
View file @
e2a902a9
...
@@ -10,7 +10,7 @@ module Ci
...
@@ -10,7 +10,7 @@ module Ci
include
ObjectStorage
::
BackgroundMove
include
ObjectStorage
::
BackgroundMove
include
Presentable
include
Presentable
include
Importable
include
Importable
include
HasRef
include
Ci
::
HasRef
include
IgnorableColumns
include
IgnorableColumns
BuildArchivedError
=
Class
.
new
(
StandardError
)
BuildArchivedError
=
Class
.
new
(
StandardError
)
...
...
app/models/ci/pipeline.rb
View file @
e2a902a9
...
@@ -11,7 +11,7 @@ module Ci
...
@@ -11,7 +11,7 @@ module Ci
include
Gitlab
::
Utils
::
StrongMemoize
include
Gitlab
::
Utils
::
StrongMemoize
include
AtomicInternalId
include
AtomicInternalId
include
EnumWithNil
include
EnumWithNil
include
HasRef
include
Ci
::
HasRef
include
ShaAttribute
include
ShaAttribute
include
FromUnion
include
FromUnion
include
UpdatedAtFilterable
include
UpdatedAtFilterable
...
...
app/models/concerns/ci/has_ref.rb
0 → 100644
View file @
e2a902a9
# 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
deleted
100644 → 0
View file @
c146461e
# 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
View file @
e2a902a9
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
require
'spec_helper'
require
'spec_helper'
describe
HasRef
do
describe
Ci
::
HasRef
do
describe
'#branch?'
do
describe
'#branch?'
do
let
(
:build
)
{
create
(
:ci_build
)
}
let
(
:build
)
{
create
(
:ci_build
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment