Merge branch 'bvl-license-check-protected-refs' into 'master'
Add a license check for permissions to users/groups on protected refs Closes #2574 See merge request !2320
Showing
with
2380 additions
and
1455 deletions
+2380
-1455
- app/assets/javascripts/dispatcher.js app/assets/javascripts/dispatcher.js +0 -4
- app/assets/javascripts/protected_branches/ee/protected_branch_access_dropdown.js ...protected_branches/ee/protected_branch_access_dropdown.js +439 -0
- app/assets/javascripts/protected_branches/ee/protected_branch_create.js ...ascripts/protected_branches/ee/protected_branch_create.js +122 -0
- app/assets/javascripts/protected_branches/ee/protected_branch_dropdown.js ...cripts/protected_branches/ee/protected_branch_dropdown.js +83 -0
- app/assets/javascripts/protected_branches/ee/protected_branch_edit.js ...avascripts/protected_branches/ee/protected_branch_edit.js +145 -0
- app/assets/javascripts/protected_branches/ee/protected_branch_edit_list.js ...ripts/protected_branches/ee/protected_branch_edit_list.js +18 -0
- app/assets/javascripts/protected_branches/ee/protected_branches_bundle.js ...cripts/protected_branches/ee/protected_branches_bundle.js +5 -0
- app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js ...ts/protected_branches/protected_branch_access_dropdown.js +12 -420
- app/assets/javascripts/protected_branches/protected_branch_create.js ...javascripts/protected_branches/protected_branch_create.js +18 -85
- app/assets/javascripts/protected_branches/protected_branch_edit.js ...s/javascripts/protected_branches/protected_branch_edit.js +24 -100
- app/assets/javascripts/protected_tags/ee/constants.js app/assets/javascripts/protected_tags/ee/constants.js +0 -0
- app/assets/javascripts/protected_tags/ee/index.js app/assets/javascripts/protected_tags/ee/index.js +9 -0
- app/assets/javascripts/protected_tags/ee/protected_tag_access_dropdown.js ...cripts/protected_tags/ee/protected_tag_access_dropdown.js +467 -0
- app/assets/javascripts/protected_tags/ee/protected_tag_create.js ...ets/javascripts/protected_tags/ee/protected_tag_create.js +96 -0
- app/assets/javascripts/protected_tags/ee/protected_tag_dropdown.js ...s/javascripts/protected_tags/ee/protected_tag_dropdown.js +86 -0
- app/assets/javascripts/protected_tags/ee/protected_tag_edit.js ...ssets/javascripts/protected_tags/ee/protected_tag_edit.js +115 -0
- app/assets/javascripts/protected_tags/ee/protected_tag_edit_list.js .../javascripts/protected_tags/ee/protected_tag_edit_list.js +18 -0
- app/assets/javascripts/protected_tags/index.js app/assets/javascripts/protected_tags/index.js +9 -2
- app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js ...vascripts/protected_tags/protected_tag_access_dropdown.js +11 -452
- app/assets/javascripts/protected_tags/protected_tag_create.js ...assets/javascripts/protected_tags/protected_tag_create.js +10 -65
- app/assets/javascripts/protected_tags/protected_tag_edit.js app/assets/javascripts/protected_tags/protected_tag_edit.js +17 -80
- app/assets/stylesheets/pages/projects.scss app/assets/stylesheets/pages/projects.scss +4 -0
- app/models/concerns/ee/protected_ref.rb app/models/concerns/ee/protected_ref.rb +48 -0
- app/models/concerns/ee/protected_ref_access.rb app/models/concerns/ee/protected_ref_access.rb +14 -0
- app/models/concerns/protected_ref.rb app/models/concerns/protected_ref.rb +8 -8
- app/models/license.rb app/models/license.rb +5 -1
- app/models/protected_branch.rb app/models/protected_branch.rb +1 -0
- app/models/protected_tag.rb app/models/protected_tag.rb +1 -0
- app/views/projects/protected_branches/_branches_list.html.haml ...iews/projects/protected_branches/_branches_list.html.haml +3 -29
- app/views/projects/protected_branches/_create_protected_branch.html.haml ...cts/protected_branches/_create_protected_branch.html.haml +13 -44
- app/views/projects/protected_branches/_index.html.haml app/views/projects/protected_branches/_index.html.haml +5 -21
- app/views/projects/protected_branches/_protected_branch.html.haml ...s/projects/protected_branches/_protected_branch.html.haml +2 -22
- app/views/projects/protected_branches/_protected_branch_access_summary.html.haml ...ected_branches/_protected_branch_access_summary.html.haml +0 -5
- app/views/projects/protected_branches/_update_protected_branch.html.haml ...cts/protected_branches/_update_protected_branch.html.haml +2 -2
- app/views/projects/protected_branches/ee/_access_level_dropdown.html.haml ...ts/protected_branches/ee/_access_level_dropdown.html.haml +0 -0
- app/views/projects/protected_branches/ee/_branches_list.html.haml ...s/projects/protected_branches/ee/_branches_list.html.haml +4 -0
- app/views/projects/protected_branches/ee/_create_protected_branch.html.haml .../protected_branches/ee/_create_protected_branch.html.haml +18 -0
- app/views/projects/protected_branches/ee/_dropdown.html.haml app/views/projects/protected_branches/ee/_dropdown.html.haml +0 -0
- app/views/projects/protected_branches/ee/_fallback_update_protected_branch.html.haml ...d_branches/ee/_fallback_update_protected_branch.html.haml +44 -0
- app/views/projects/protected_branches/ee/_index.html.haml app/views/projects/protected_branches/ee/_index.html.haml +10 -0
- app/views/projects/protected_branches/ee/_protected_branch.html.haml ...rojects/protected_branches/ee/_protected_branch.html.haml +2 -0
- app/views/projects/protected_branches/ee/_protected_branch_access_summary.html.haml ...ed_branches/ee/_protected_branch_access_summary.html.haml +5 -0
- app/views/projects/protected_branches/shared/_branches_list.html.haml ...ojects/protected_branches/shared/_branches_list.html.haml +28 -0
- app/views/projects/protected_branches/shared/_create_protected_branch.html.haml ...tected_branches/shared/_create_protected_branch.html.haml +33 -0
- app/views/projects/protected_branches/shared/_dropdown.html.haml ...ws/projects/protected_branches/shared/_dropdown.html.haml +15 -0
- app/views/projects/protected_branches/shared/_index.html.haml ...views/projects/protected_branches/shared/_index.html.haml +24 -0
- app/views/projects/protected_branches/shared/_matching_branch.html.haml ...ects/protected_branches/shared/_matching_branch.html.haml +0 -0
- app/views/projects/protected_branches/shared/_protected_branch.html.haml ...cts/protected_branches/shared/_protected_branch.html.haml +24 -0
- app/views/projects/protected_branches/show.html.haml app/views/projects/protected_branches/show.html.haml +1 -1
- app/views/projects/protected_tags/_create_protected_tag.html.haml ...s/projects/protected_tags/_create_protected_tag.html.haml +7 -35
- app/views/projects/protected_tags/_index.html.haml app/views/projects/protected_tags/_index.html.haml +5 -21
- app/views/projects/protected_tags/_protected_tag.html.haml app/views/projects/protected_tags/_protected_tag.html.haml +2 -22
- app/views/projects/protected_tags/_protected_tag_access_summary.html.haml ...ts/protected_tags/_protected_tag_access_summary.html.haml +0 -2
- app/views/projects/protected_tags/_tags_list.html.haml app/views/projects/protected_tags/_tags_list.html.haml +3 -29
- app/views/projects/protected_tags/ee/_access_level_dropdown.html.haml ...ojects/protected_tags/ee/_access_level_dropdown.html.haml +0 -0
- app/views/projects/protected_tags/ee/_create_protected_tag.html.haml ...rojects/protected_tags/ee/_create_protected_tag.html.haml +12 -0
- app/views/projects/protected_tags/ee/_fallback_update_protected_tag.haml ...cts/protected_tags/ee/_fallback_update_protected_tag.haml +21 -0
- app/views/projects/protected_tags/ee/_index.html.haml app/views/projects/protected_tags/ee/_index.html.haml +10 -0
- app/views/projects/protected_tags/ee/_protected_tag.html.haml ...views/projects/protected_tags/ee/_protected_tag.html.haml +2 -0
- app/views/projects/protected_tags/ee/_protected_tag_access_summary.html.haml ...protected_tags/ee/_protected_tag_access_summary.html.haml +2 -0
- app/views/projects/protected_tags/ee/_tags_list.html.haml app/views/projects/protected_tags/ee/_tags_list.html.haml +4 -0
- app/views/projects/protected_tags/shared/_create_protected_tag.html.haml ...cts/protected_tags/shared/_create_protected_tag.html.haml +29 -0
- app/views/projects/protected_tags/shared/_dropdown.html.haml app/views/projects/protected_tags/shared/_dropdown.html.haml +0 -0
- app/views/projects/protected_tags/shared/_index.html.haml app/views/projects/protected_tags/shared/_index.html.haml +24 -0
- app/views/projects/protected_tags/shared/_matching_tag.html.haml ...ws/projects/protected_tags/shared/_matching_tag.html.haml +0 -0
- app/views/projects/protected_tags/shared/_protected_tag.html.haml ...s/projects/protected_tags/shared/_protected_tag.html.haml +22 -0
- app/views/projects/protected_tags/shared/_tags_list.html.haml ...views/projects/protected_tags/shared/_tags_list.html.haml +30 -0
- app/views/projects/protected_tags/show.html.haml app/views/projects/protected_tags/show.html.haml +1 -1
- app/views/projects/settings/repository/show.html.haml app/views/projects/settings/repository/show.html.haml +11 -2
- config/webpack.config.js config/webpack.config.js +2 -0
- spec/features/protected_branches_spec.rb spec/features/protected_branches_spec.rb +62 -1
- spec/features/protected_tags_spec.rb spec/features/protected_tags_spec.rb +39 -1
- spec/models/ee/protected_ref_access_spec.rb spec/models/ee/protected_ref_access_spec.rb +58 -0
- spec/models/ee/protected_ref_spec.rb spec/models/ee/protected_ref_spec.rb +16 -0
- No files found.
Please register or sign in to comment