Remove sensitive data and sign commits#278
Open
runzeng-okta wants to merge 507 commits intomasterfrom
Open
Conversation
Update workflow.json Update workflow.json added readme.md Create readme.md Delete readme.md Delete workflow.json Revert "Delete workflow.json" This reverts commit dac787a. Revert "Delete readme.md" This reverts commit a4627cd. OKTA-428216 <<<Jenkins Check-In of Tested SHA: 5f32176 for eng_productivity_ci_bot_okta@okta.com>>> Artifact: workflows-templates Files changed count: 5 PR Link: "#97"
Update workflow.json Delete readme.md Delete workflow.json Revert "Delete workflow.json" This reverts commit dac787a. Revert "Delete readme.md" This reverts commit a4627cd. Delete readme.md Add files via upload OKTA-428216 <<<Jenkins Check-In of Tested SHA: fcf8f4983a7b7820a0ae62e48214dd41be84cab3 for eng_productivity_ci_bot_okta@okta.com>>> Artifact: workflows-templates Files changed count: 1 PR Link: "#109"
Delete readme.md Add files via upload Update readme.md OKTA-428237 <<<Jenkins Check-In of Tested SHA: eda6ea5befeefa2d51e8d5526f1b6d0dc677b833 for eng_productivity_ci_bot_okta@okta.com>>> Artifact: workflows-templates Files changed count: 2 PR Link: "#107"
Create test.md Add files via upload Delete test.md Update readme.md Update readme.md OKTA-428206 <<<Jenkins Check-In of Tested SHA: d1c286ac2538c6830fe412542e78e720638b6ee7 for eng_productivity_ci_bot_okta@okta.com>>> Artifact: workflows-templates Files changed count: 11 PR Link: "#106"
Add files via upload Create test.md Add files via upload Delete test.md Update readme.md Update readme.md OKTA-427243 <<<Jenkins Check-In of Tested SHA: abf1e2eed1df09e6585e51ffafb420689826af47 for eng_productivity_ci_bot_okta@okta.com>>> Artifact: workflows-templates Files changed count: 4 PR Link: "#108"
…_attacks (#252) * [OKTA-851545] fix: updated template with flow changes, Okta event card replaced with Okta devices card, corresponnding image,readme file and updated flopack * [OKTA-851545] fix: added a new image for changed flow * [OKTA-851545] fix: fixed back the title for readme which was changed and changed template name * [OKTA-851545] fix: updated readme file
…are reset (#253) * [OKTA-851083] fix : update Trigger notifications when all MFA factors are reset * [OKTA-851083] fix : update Trigger notifications when all MFA factors are reset * [OKTA-851083] fix : update Trigger notifications when all MFA factors are reset * [OKTA-851083] fix : Update readme.md and screenshots
* [OKTA-851065] fix : update Encourage stronger MFA adoption * [OKTA-851065] fix : update Encourage stronger MFA adoption * [OKTA-851065] fix : update Encourage stronger MFA adoption * [OKTA-851072] fix : Update readme.md * [OKTA-851072] fix : Update workflows.json
…le_account_takeove (#254) * [OKTA-851060] fix: update a template tracking_and_alerting_for_possible_account_takeove * [OKTA-851060] fix: updated the readme file * [OKTA-851060] fix: removed extra space from workflow.json file
#256) * [OKTA-848595] feat: add a new template get_started_with_okta_workflows * updated config.yml on circleci folder according to latest update * adjusted the space on config.yml at 26th line
…pace (#258) * [OKTA-881584] fix: update a template raw_http_connection_google_workspace * [OKTA-881584] fix: changed folder name back to raw_http_connection_gsuite * [OKTA-881584] fix: modified workflow.json * [OKTA-881584] fix: removed folder aw_http_connection_google_workspace contents * [OKTA-881584] fix: updated readme after content writer reviewed it * [OKTA-881584] fix: updated readme locations where tempplate name is mentioned * [OKTA-881584] fix: updated title on workflow.json with the similar ones as readme
* [OKTA-881584] fix: updated workflow.json file description * [OKTA-881584] fix: update the flopack, json and the resources for the template raw_http_connection_gsuite * [OKTA-881584] fix: update the resources image * [OKTA-881584] fix: update the workflow.json with appropriate resource image hash file
… access_server_resou (#264) * [OKTA-865883] feat: add a new template governance_for_okta_privileged_access_server_resou * [OKTA-865883] feat: update the connectors.json with the new connector oktaprivilegedaccess
…ite_users_new [OKTA-865884] feat: add a new template bulk_convert_users_to_lite_users
…265) * updated the scripts details_modifier.js,image_hasher.js and utils.js scripts to automate process of adding screenshotURL after generating hashed images * Added test scripts for testing auto update of screenshot URLs to each flos and also updating a screenshotURL link * Adding functionality to remove Stashcount field from workflow.json if it's value is 0
…s_from_mfa [OKTA-899628] fix : update a template emporarily_exempt _users _from…
…itions [OKTA-899628] feat : add a new template oig_access_request_conditions
…nagement [OKTA-904475] feat : add a new template bookmark_application_management
…and_migration_to_okt (#273)
…d_folders_with_github_1 [OKTA-918640] fix : update a template versioning_for_flows_and_folders_with_github
Contributor
Author
The merging is blocked by the commits don't have signatures. However, re-signing commits generates entirely new commit hashes. As a result, the new commits have no shared history with existing branches — including master. This makes it impossible to push changes to an existing pull request, and also prevents you from creating a new pull request, since Git sees the re-signed branch as unrelated to the original project history, so can't compare and generate diff for pushing changes or creating new PR. All commits must have signature is restricted under the whole Okta org, not only to this repo, so this repository admin can't remove the rule temporarily to allow this PR. It's a dead end, I can't merge the PR until Okta org removes the rule temporarily. |
Contributor
Author
|
There are two ways to merge the fix to master branch, but seems none of them can work. Method1: merging PR needs to add signature to all commits.
Method2: remove signature rule.
|
…torial readme for an easy change.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Create this PR is to reopen #276 .