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
1ec2accf
Commit
1ec2accf
authored
Apr 28, 2020
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove FF ci_resource_group
This commit removes the FF
parent
d58353db
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
3 deletions
+1
-3
app/models/ci/build.rb
app/models/ci/build.rb
+1
-2
lib/gitlab/ci/pipeline/seed/build/resource_group.rb
lib/gitlab/ci/pipeline/seed/build/resource_group.rb
+0
-1
No files found.
app/models/ci/build.rb
View file @
1ec2accf
...
@@ -486,8 +486,7 @@ module Ci
...
@@ -486,8 +486,7 @@ module Ci
end
end
def
requires_resource?
def
requires_resource?
Feature
.
enabled?
(
:ci_resource_group
,
project
,
default_enabled:
true
)
&&
self
.
resource_group_id
.
present?
self
.
resource_group_id
.
present?
end
end
def
has_environment?
def
has_environment?
...
...
lib/gitlab/ci/pipeline/seed/build/resource_group.rb
View file @
1ec2accf
...
@@ -16,7 +16,6 @@ module Gitlab
...
@@ -16,7 +16,6 @@ module Gitlab
end
end
def
to_resource
def
to_resource
return
unless
Feature
.
enabled?
(
:ci_resource_group
,
build
.
project
,
default_enabled:
true
)
return
unless
resource_group_key
.
present?
return
unless
resource_group_key
.
present?
resource_group
=
build
.
project
.
resource_groups
resource_group
=
build
.
project
.
resource_groups
...
...
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