diff options
author | 2018-11-19 11:34:59 +0100 | |
---|---|---|
committer | 2018-11-19 11:34:59 +0100 | |
commit | 93041b1d8f90773d2599b310489ae26c4e1ece3c (patch) | |
tree | 3ccd93a74dc40e7456fc4a54e20b00f6fefe9175 | |
parent | Pin electron-fetch to 1.1.0 (diff) | |
parent | Update stale.yml (diff) | |
download | ferdium-app-93041b1d8f90773d2599b310489ae26c4e1ece3c.tar.gz ferdium-app-93041b1d8f90773d2599b310489ae26c4e1ece3c.tar.zst ferdium-app-93041b1d8f90773d2599b310489ae26c4e1ece3c.zip |
Merge branch 'master' into develop
-rw-r--r-- | .github/stale.yml | 25 | ||||
-rw-r--r-- | src/lib/Menu.js | 3 |
2 files changed, 28 insertions, 0 deletions
diff --git a/.github/stale.yml b/.github/stale.yml new file mode 100644 index 000000000..59a443d96 --- /dev/null +++ b/.github/stale.yml | |||
@@ -0,0 +1,25 @@ | |||
1 | # Configuration for probot-stale - https://github.com/probot/stale | ||
2 | |||
3 | # Number of days of inactivity before an Issue or Pull Request becomes stale | ||
4 | daysUntilStale: 365 # 1 year | ||
5 | |||
6 | # Number of days of inactivity before an Issue or Pull Request with the stale label is closed. | ||
7 | # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale. | ||
8 | daysUntilClose: -1 # Close the issue almost immediately. See: https://github.com/probot/stale/issues/131 | ||
9 | |||
10 | # Issues with these labels will never be considered stale | ||
11 | exemptLabels: | ||
12 | - blocker | ||
13 | - security | ||
14 | |||
15 | # Label to use when marking an issue as stale | ||
16 | staleLabel: "[Status] Stale" | ||
17 | |||
18 | # Comment to post when marking an issue as stale. Set to `false` to disable | ||
19 | markComment: > | ||
20 | This issue has been automatically marked as stale because it has not had | ||
21 | recent activity. It will be closed if no further activity occurs. Thank you | ||
22 | for your contributions. | ||
23 | |||
24 | # Comment to post when closing a stale issue. Set to `false` to disable | ||
25 | closeComment: false | ||
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index bdaf203c5..76b0f28d5 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -589,6 +589,9 @@ export default class FranzMenu { | |||
589 | { | 589 | { |
590 | label: intl.formatMessage(menuItems.quit), | 590 | label: intl.formatMessage(menuItems.quit), |
591 | role: 'quit', | 591 | role: 'quit', |
592 | click: () => { | ||
593 | app.quit(); | ||
594 | }, | ||
592 | }, | 595 | }, |
593 | ], | 596 | ], |
594 | }); | 597 | }); |