diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-21 15:21:10 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-21 15:21:10 +0000 |
| commit | e33f87ac0fabaab468ce4b457996cc0f1b1bb648 (patch) | |
| tree | 8bf0de72a9acac014cfdaddab7d463b208294af2 /app/views/ci | |
| parent | 5baf990db20a75078684702782c24399ef9eb0fa (diff) | |
| download | gitlab-ce-e33f87ac0fabaab468ce4b457996cc0f1b1bb648.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/ci')
| -rw-r--r-- | app/views/ci/variables/_index.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/ci/variables/_index.html.haml b/app/views/ci/variables/_index.html.haml index 3fa957f38a0..4d8df4cc12a 100644 --- a/app/views/ci/variables/_index.html.haml +++ b/app/views/ci/variables/_index.html.haml @@ -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} } |