Skip to content

Commit a1432ef

Browse files
turt2liveturt2live
authored
Merge pull request element-hq#10321 from vector-im/travis/rageshake-required
Require descriptions in mxSendRageshake and remove infinite loop in issue templates
2 parents 5379a26 + 604e4bb commit a1432ef

3 files changed

Lines changed: 12 additions & 6 deletions

File tree

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ Describe here the problem that you are experiencing, or the feature you are requ
3131

3232
Describe how what happens differs from what you expected.
3333

34-
Log: sent/not sent? <!-- You can send us the app's logs via the 'Report bug'
35-
link on the 'Settings' page. Very important for hard-to-reproduce bugs. Please
36-
file a bug here too! -->
34+
<!-- Please send us logs for your bug report. They're very important for bugs
35+
which are hard to reproduce. To do this, create this issue then go to your
36+
account settings and click 'Submit Debug Logs' from the Help & About tab -->
37+
Logs being sent: yes/no
3738

3839
<!-- Include screenshots if possible: you can drag and drop images below. -->
3940

‎.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ Describe here the problem that you are experiencing, or the feature you are requ
3333

3434
Describe how what happens differs from what you expected.
3535

36-
Log: sent/not sent? <!-- You can send us the app's logs via the 'Report bug'
37-
link on the 'Settings' page. Very important for hard-to-reproduce bugs. Please
38-
file a bug here too! -->
36+
<!-- Please send us logs for your bug report. They're very important for bugs
37+
which are hard to reproduce. To do this, create this issue then go to your
38+
account settings and click 'Submit Debug Logs' from the Help & About tab -->
39+
Logs being sent: yes/no
3940

4041
<!-- Include screenshots if possible: you can drag and drop images below. -->
4142

‎src/vector/rageshakesetup.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ initRageshake();
5050

5151
global.mxSendRageshake = function(text, withLogs) {
5252
if (withLogs === undefined) withLogs = true;
53+
if (!text || !text.trim()) {
54+
console.error("Cannot send a rageshake without a message - please tell us what went wrong");
55+
return;
56+
}
5357
require(['matrix-react-sdk/lib/rageshake/submit-rageshake'], (s) => {
5458
s(SdkConfig.get().bug_report_endpoint_url, {
5559
userText: text,

0 commit comments

Comments
 (0)