Skip to content

Commit 99d45bd

Browse files
author
Henry Goodman
committed
Updating label for whitelist deploy keys force push
1 parent 712b8c2 commit 99d45bd

File tree

2 files changed

+29
-1
lines changed

2 files changed

+29
-1
lines changed

notes.txt

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
NOTES:
2+
3+
- The logic behind the box disabling/enabling is the class `toggle-target-enabled` with `data-target=#target-id`
4+
5+
6+
TODO:
7+
- In PR update UI, currently you can Update by merge
8+
- We need to keep this, but also allow Update by Rebase iff CanForcePush
9+
10+
11+
- Ensure logic is correct for saving
12+
- Saving the whitelist users/teams correctly DONE
13+
14+
- Check rules is consistent DONE
15+
- Apply backend logic (look at how normal pushing is done currently)
16+
17+
- Make sure format looks like on new rule creation DONE
18+
19+
- Force push ALSO requires normal push DONE
20+
- Make it so option is disabled if regular push is also disabled
21+
22+
23+
- Check if API is updated at all (might need to update documentation)
24+
25+
- Localise strings in template DONE for Eng
26+
27+
repo.settings.protect_enable_force_push
28+
repo.settings.protect_enable_force_push_desc

options/locale/locale_en-US.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2298,7 +2298,7 @@ settings.protect_whitelist_teams = Whitelisted teams for pushing:
22982298
settings.protect_whitelist_search_teams = Search teams…
22992299
settings.protect_force_push_whitelist_users = Whitelisted users for force pushing:
23002300
settings.protect_force_push_whitelist_teams = Whitelisted teams for force pushing:
2301-
settings.protect_force_push_whitelist_deploy_keys = Whitelist deploy keys with write access to push.
2301+
settings.protect_force_push_whitelist_deploy_keys = Whitelist deploy keys with write access to force push.
23022302
settings.protect_merge_whitelist_committers = Enable Merge Whitelist
23032303
settings.protect_merge_whitelist_committers_desc = Allow only whitelisted users or teams to merge pull requests into this branch.
23042304
settings.protect_merge_whitelist_users = Whitelisted users for merging:

0 commit comments

Comments
 (0)