Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[0.9.0] Backport #1639 #1640

Merged
merged 1 commit into from
Mar 13, 2023
Merged

[0.9.0] Backport #1639 #1640

merged 1 commit into from
Mar 13, 2023

Conversation

zenmonkeykstop
Copy link
Contributor

@zenmonkeykstop zenmonkeykstop commented Mar 13, 2023 •
edited
Loading

Description

Backports the fix from #1639, restoring the old-style desktop file. Needed to allow freedomofpress/securedrop-builder#424 to pass.

Test Plan

@zenmonkeykstop
Revert "Refactor remove unused desktop entry file"
1df3364 
This reverts commit 10225d7.

Both files are required until a version of securedrop-workstation
is available with Salt changes referencing the new file name.

(cherry picked from commit c729e05)
@zenmonkeykstop zenmonkeykstop requested a review from a team as a code owner March 13, 2023 23:41
@rocodes rocodes self-assigned this Mar 13, 2023
@rocodes rocodes merged commit 9068851 into main Mar 13, 2023
@rocodes rocodes deleted the backport-1639 branch March 13, 2023 23:43
@cfm cfm mentioned this pull request Apr 13, 2023
Closed
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rocodes rocodes rocodes approved these changes

Assignees

@rocodes rocodes

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@zenmonkeykstop @rocodes