Merge branch 'remove-group-scoped-variables-feature-flag' into 'master' (b83bee17) · Commits · gitlab-cn / Gitlab Backup · JiHu GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

Gitlab Backup
- Activity
- Members

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

gitlab-cn
Gitlab Backup
Commits
b83bee17

Commit b83bee17 authored 4 years ago by

Mark Chao

Downloads
- Plain Diff

Merge branch 'remove-group-scoped-variables-feature-flag' into 'master'

Remove :scoped_group_variables feature flag [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!58200

parents 06094f7a a316ac96

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue 1 addition, 10 deletions

...scripts/ci_variable_list/components/ci_variable_modal.vue
app/assets/javascripts/ci_variable_list/components/ci_variable_table.vue 1 addition, 4 deletions

...scripts/ci_variable_list/components/ci_variable_table.vue
app/controllers/groups/settings/ci_cd_controller.rb 0 additions, 5 deletions

app/controllers/groups/settings/ci_cd_controller.rb
app/models/group.rb 5 additions, 7 deletions

app/models/group.rb
app/views/ci/group_variables/_index.html.haml 2 additions, 3 deletions

app/views/ci/group_variables/_index.html.haml
app/views/ci/group_variables/_variable_header.html.haml 2 additions, 3 deletions

app/views/ci/group_variables/_variable_header.html.haml
config/feature_flags/development/scoped_group_variables.yml 0 additions, 8 deletions

config/feature_flags/development/scoped_group_variables.yml
doc/api/group_level_variables.md 12 additions, 5 deletions

doc/api/group_level_variables.md
doc/ci/variables/README.md 4 additions, 0 deletions

doc/ci/variables/README.md
ee/app/models/ee/group.rb 1 addition, 2 deletions

ee/app/models/ee/group.rb
ee/changelogs/unreleased/remove-group-scoped-variables-feature-flag.yml 5 additions, 0 deletions

...unreleased/remove-group-scoped-variables-feature-flag.yml
ee/spec/models/ee/group_spec.rb 11 additions, 13 deletions

ee/spec/models/ee/group_spec.rb
spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js 0 additions, 18 deletions

...end/ci_variable_list/components/ci_variable_modal_spec.js
spec/frontend/ci_variable_list/components/ci_variable_table_spec.js 2 additions, 20 deletions

...end/ci_variable_list/components/ci_variable_table_spec.js
spec/models/group_spec.rb 0 additions, 24 deletions

spec/models/group_spec.rb

with 46 additions and 122 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment