Skip to content

Commit

Permalink
Updating label for whitelist deploy keys force push
Browse files Browse the repository at this point in the history
  • Loading branch information
Henry Goodman committed Nov 16, 2023
1 parent 712b8c2 commit 99d45bd
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 1 deletion.
28 changes: 28 additions & 0 deletions notes.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
NOTES:

- The logic behind the box disabling/enabling is the class `toggle-target-enabled` with `data-target=#target-id`


TODO:
- In PR update UI, currently you can Update by merge
- We need to keep this, but also allow Update by Rebase iff CanForcePush


- Ensure logic is correct for saving
- Saving the whitelist users/teams correctly DONE

- Check rules is consistent DONE
- Apply backend logic (look at how normal pushing is done currently)

- Make sure format looks like on new rule creation DONE

- Force push ALSO requires normal push DONE
- Make it so option is disabled if regular push is also disabled


- Check if API is updated at all (might need to update documentation)

- Localise strings in template DONE for Eng

repo.settings.protect_enable_force_push
repo.settings.protect_enable_force_push_desc
2 changes: 1 addition & 1 deletion options/locale/locale_en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2298,7 +2298,7 @@ settings.protect_whitelist_teams = Whitelisted teams for pushing:
settings.protect_whitelist_search_teams = Search teams…
settings.protect_force_push_whitelist_users = Whitelisted users for force pushing:
settings.protect_force_push_whitelist_teams = Whitelisted teams for force pushing:
settings.protect_force_push_whitelist_deploy_keys = Whitelist deploy keys with write access to push.
settings.protect_force_push_whitelist_deploy_keys = Whitelist deploy keys with write access to force push.
settings.protect_merge_whitelist_committers = Enable Merge Whitelist
settings.protect_merge_whitelist_committers_desc = Allow only whitelisted users or teams to merge pull requests into this branch.
settings.protect_merge_whitelist_users = Whitelisted users for merging:
Expand Down

0 comments on commit 99d45bd

Please sign in to comment.