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
6fb91b7e
Commit
6fb91b7e
authored
Apr 15, 2020
by
pburdette
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set new_variables_ui FF to true
Set default value enabled true for new_variables_ui feature flag.
parent
b87db076
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/controllers/groups/settings/ci_cd_controller.rb
app/controllers/groups/settings/ci_cd_controller.rb
+1
-1
app/controllers/projects/settings/ci_cd_controller.rb
app/controllers/projects/settings/ci_cd_controller.rb
+1
-1
app/views/ci/variables/_index.html.haml
app/views/ci/variables/_index.html.haml
+1
-1
No files found.
app/controllers/groups/settings/ci_cd_controller.rb
View file @
6fb91b7e
...
...
@@ -7,7 +7,7 @@ module Groups
before_action
:authorize_admin_group!
before_action
:authorize_update_max_artifacts_size!
,
only:
[
:update
]
before_action
do
push_frontend_feature_flag
(
:new_variables_ui
,
@group
)
push_frontend_feature_flag
(
:new_variables_ui
,
@group
,
default_enabled:
true
)
push_frontend_feature_flag
(
:ajax_new_deploy_token
,
@group
)
end
before_action
:define_variables
,
only:
[
:show
,
:create_deploy_token
]
...
...
app/controllers/projects/settings/ci_cd_controller.rb
View file @
6fb91b7e
...
...
@@ -6,7 +6,7 @@ module Projects
before_action
:authorize_admin_pipeline!
before_action
:define_variables
before_action
do
push_frontend_feature_flag
(
:new_variables_ui
,
@project
)
push_frontend_feature_flag
(
:new_variables_ui
,
@project
,
default_enabled:
true
)
push_frontend_feature_flag
(
:ajax_new_deploy_token
,
@project
)
end
...
...
app/views/ci/variables/_index.html.haml
View file @
6fb91b7e
...
...
@@ -5,7 +5,7 @@
-
link_start
=
'<a href="%{url}">'
.
html_safe
%
{
url:
help_page_path
(
'ci/variables/README'
,
anchor:
'protected-variables'
)
}
=
s_
(
'Environment variables are configured by your administrator to be %{link_start}protected%{link_end} by default'
).
html_safe
%
{
link_start:
link_start
,
link_end:
'</a>'
.
html_safe
}
-
if
Feature
.
enabled?
(
:new_variables_ui
,
@project
||
@group
)
-
if
Feature
.
enabled?
(
:new_variables_ui
,
@project
||
@group
,
default_enabled:
true
)
-
is_group
=
!
@group
.
nil?
#js-ci-project-variables
{
data:
{
endpoint:
save_endpoint
,
project_id:
@project
&
.
id
||
''
,
group:
is_group
.
to_s
,
maskable_regex:
ci_variable_maskable_regex
}
}
...
...
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