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
eee8efdf
Commit
eee8efdf
authored
Oct 07, 2020
by
Adrien Kohlbecker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove feature flag
parent
fa312dfb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
11 deletions
+1
-11
app/controllers/projects/runners_controller.rb
app/controllers/projects/runners_controller.rb
+1
-1
app/models/namespace.rb
app/models/namespace.rb
+0
-2
app/models/project.rb
app/models/project.rb
+0
-1
config/feature_flags/development/disable_shared_runners_on_group.yml
...ure_flags/development/disable_shared_runners_on_group.yml
+0
-7
No files found.
app/controllers/projects/runners_controller.rb
View file @
eee8efdf
...
@@ -52,7 +52,7 @@ class Projects::RunnersController < Projects::ApplicationController
...
@@ -52,7 +52,7 @@ class Projects::RunnersController < Projects::ApplicationController
end
end
def
toggle_shared_runners
def
toggle_shared_runners
if
Feature
.
enabled?
(
:disable_shared_runners_on_group
,
default_enabled:
true
)
&&
!
project
.
shared_runners_enabled
&&
project
.
group
&&
project
.
group
.
shared_runners_setting
==
'disabled_and_unoverridable'
if
!
project
.
shared_runners_enabled
&&
project
.
group
&&
project
.
group
.
shared_runners_setting
==
'disabled_and_unoverridable'
return
redirect_to
project_runners_path
(
@project
),
alert:
_
(
"Cannot enable shared runners because parent group does not allow it"
)
return
redirect_to
project_runners_path
(
@project
),
alert:
_
(
"Cannot enable shared runners because parent group does not allow it"
)
end
end
...
...
app/models/namespace.rb
View file @
eee8efdf
...
@@ -393,7 +393,6 @@ class Namespace < ApplicationRecord
...
@@ -393,7 +393,6 @@ class Namespace < ApplicationRecord
end
end
def
changing_shared_runners_enabled_is_allowed
def
changing_shared_runners_enabled_is_allowed
return
unless
Feature
.
enabled?
(
:disable_shared_runners_on_group
,
default_enabled:
true
)
return
unless
new_record?
||
changes
.
has_key?
(
:shared_runners_enabled
)
return
unless
new_record?
||
changes
.
has_key?
(
:shared_runners_enabled
)
if
shared_runners_enabled
&&
has_parent?
&&
parent
.
shared_runners_setting
==
'disabled_and_unoverridable'
if
shared_runners_enabled
&&
has_parent?
&&
parent
.
shared_runners_setting
==
'disabled_and_unoverridable'
...
@@ -402,7 +401,6 @@ class Namespace < ApplicationRecord
...
@@ -402,7 +401,6 @@ class Namespace < ApplicationRecord
end
end
def
changing_allow_descendants_override_disabled_shared_runners_is_allowed
def
changing_allow_descendants_override_disabled_shared_runners_is_allowed
return
unless
Feature
.
enabled?
(
:disable_shared_runners_on_group
,
default_enabled:
true
)
return
unless
new_record?
||
changes
.
has_key?
(
:allow_descendants_override_disabled_shared_runners
)
return
unless
new_record?
||
changes
.
has_key?
(
:allow_descendants_override_disabled_shared_runners
)
if
shared_runners_enabled
&&
!
new_record?
if
shared_runners_enabled
&&
!
new_record?
...
...
app/models/project.rb
View file @
eee8efdf
...
@@ -1194,7 +1194,6 @@ class Project < ApplicationRecord
...
@@ -1194,7 +1194,6 @@ class Project < ApplicationRecord
end
end
def
changing_shared_runners_enabled_is_allowed
def
changing_shared_runners_enabled_is_allowed
return
unless
Feature
.
enabled?
(
:disable_shared_runners_on_group
,
default_enabled:
true
)
return
unless
new_record?
||
changes
.
has_key?
(
:shared_runners_enabled
)
return
unless
new_record?
||
changes
.
has_key?
(
:shared_runners_enabled
)
if
shared_runners_enabled
&&
group
&&
group
.
shared_runners_setting
==
'disabled_and_unoverridable'
if
shared_runners_enabled
&&
group
&&
group
.
shared_runners_setting
==
'disabled_and_unoverridable'
...
...
config/feature_flags/development/disable_shared_runners_on_group.yml
deleted
100644 → 0
View file @
fa312dfb
---
name
:
disable_shared_runners_on_group
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36080
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/258991
type
:
development
group
:
group::runner
default_enabled
:
true
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