diff --git a/.tx/config b/.tx/config index c55c67fe30..6fd94503ce 100644 --- a/.tx/config +++ b/.tx/config @@ -31,4 +31,3 @@ file_filter = locale//translations.json source_file = locale/en/translations.json source_lang = en type = KEYVALUEJSON - diff --git a/docs/git/working-copies.md b/docs/git/working-copies.md index cb30ef6f0a..d31a2f4c86 100644 --- a/docs/git/working-copies.md +++ b/docs/git/working-copies.md @@ -50,4 +50,3 @@ working copies: - `git push`: This pushes code from your local repo to one of the remotes. - `git remote`: This helps you configure short names for remotes. - `git pull`: This pulls code, but by default creates a merge commit. **Do not use this, please**! - diff --git a/docs/subsystems/presence.md b/docs/subsystems/presence.md index 0074a1695a..33a72e8571 100644 --- a/docs/subsystems/presence.md +++ b/docs/subsystems/presence.md @@ -52,4 +52,3 @@ about that data structure: desktop or the mobile app, but for a basic client, you will likely only want to parse the "aggregated" key, which shows the summary answer for "is this user online". - diff --git a/docs/subsystems/users.md b/docs/subsystems/users.md index 822e6ed01f..2de12f497b 100644 --- a/docs/subsystems/users.md +++ b/docs/subsystems/users.md @@ -45,4 +45,3 @@ if a user sends a message to a user we don't yet know about, the third party will confirm that the user exists, and we subsequently create a "mirror dummy" user on-demand for that account.) - diff --git a/docs/subsystems/widgets.md b/docs/subsystems/widgets.md index 89c2438902..b59df79420 100644 --- a/docs/subsystems/widgets.md +++ b/docs/subsystems/widgets.md @@ -414,5 +414,3 @@ If certain widget features are behind feature flags, this will slightly complicate the typeahead implementation. Mostly we just need the server to share any relevant settings with the client. - - diff --git a/docs/testing/testing-with-node.md b/docs/testing/testing-with-node.md index 7448fd3d21..66aa91d722 100644 --- a/docs/testing/testing-with-node.md +++ b/docs/testing/testing-with-node.md @@ -229,4 +229,3 @@ To use Webstorm to debug a given node test file, do the following: [webstorm-debugging]: https://blog.jetbrains.com/webstorm/2018/01/how-to-debug-with-webstorm/ [vagrant-webstorm]: https://www.jetbrains.com/help/webstorm/vagrant-support.html?section=Windows%20or%20Linux - diff --git a/docs/testing/typescript.md b/docs/testing/typescript.md index 385d65235a..eb4ed15bf5 100644 --- a/docs/testing/typescript.md +++ b/docs/testing/typescript.md @@ -100,4 +100,3 @@ significant risk of introducing regressions from typos, refactors that don't quite work how they were expected to, etc. [typescript-handbook]: https://www.typescriptlang.org/docs/handbook/basic-types.html - diff --git a/frontend_tests/node_tests/alert_words_ui.js b/frontend_tests/node_tests/alert_words_ui.js index eb04fc4d0e..eeca8fe687 100644 --- a/frontend_tests/node_tests/alert_words_ui.js +++ b/frontend_tests/node_tests/alert_words_ui.js @@ -177,4 +177,3 @@ run_test('close_status_message', () => { close(event); assert(!alert.visible()); }); - diff --git a/frontend_tests/node_tests/colorspace.js b/frontend_tests/node_tests/colorspace.js index 7eaef8f712..febe30515a 100644 --- a/frontend_tests/node_tests/colorspace.js +++ b/frontend_tests/node_tests/colorspace.js @@ -64,5 +64,3 @@ run_test('getHexColor', () => { var actual_value = colorspace.getHexColor(rgb_color); assert.equal(actual_value, expected_value); }); - - diff --git a/frontend_tests/node_tests/pm_conversations.js b/frontend_tests/node_tests/pm_conversations.js index ec65e810ce..afcd22e4b3 100644 --- a/frontend_tests/node_tests/pm_conversations.js +++ b/frontend_tests/node_tests/pm_conversations.js @@ -28,4 +28,3 @@ run_test('insert_recent_private_message', () => { assert.deepEqual(pmc.recent.get_strings(), ['1', '2']); }); - diff --git a/frontend_tests/node_tests/presence.js b/frontend_tests/node_tests/presence.js index f3871b55c4..1ea51af5df 100644 --- a/frontend_tests/node_tests/presence.js +++ b/frontend_tests/node_tests/presence.js @@ -240,4 +240,3 @@ run_test('set_info_for_user', () => { var expected = { status: 'active', mobile: false, last_active: 500 }; assert.deepEqual(presence.presence_info[alice.user_id], expected); }); - diff --git a/frontend_tests/node_tests/scroll_util.js b/frontend_tests/node_tests/scroll_util.js index fc73fc8f13..f1ac5f9edc 100644 --- a/frontend_tests/node_tests/scroll_util.js +++ b/frontend_tests/node_tests/scroll_util.js @@ -93,4 +93,3 @@ run_test('scroll_element_into_container', () => { scroll_util.scroll_element_into_container(elem2, container); assert.equal(container.scrollTop(), 250 - 100 + 3 + 15); }); - diff --git a/frontend_tests/node_tests/settings_profile_fields.js b/frontend_tests/node_tests/settings_profile_fields.js index 58152adaed..1b7fcc5cb9 100644 --- a/frontend_tests/node_tests/settings_profile_fields.js +++ b/frontend_tests/node_tests/settings_profile_fields.js @@ -175,6 +175,3 @@ run_test('populate_profile_fields', () => { is_admin: true, }); }); - - - diff --git a/frontend_tests/node_tests/stream_events.js b/frontend_tests/node_tests/stream_events.js index 23ed4b1140..5589c542e1 100644 --- a/frontend_tests/node_tests/stream_events.js +++ b/frontend_tests/node_tests/stream_events.js @@ -382,4 +382,3 @@ run_test('remove_deactivated_user_from_all_streams', () => { assert(!dev_help.subscribers.has(george.user_id)); }); - diff --git a/frontend_tests/node_tests/typing_data.js b/frontend_tests/node_tests/typing_data.js index 4d9fa708fb..02c3b870fd 100644 --- a/frontend_tests/node_tests/typing_data.js +++ b/frontend_tests/node_tests/typing_data.js @@ -119,4 +119,3 @@ run_test('timers', () => { }); }); - diff --git a/frontend_tests/node_tests/unread.js b/frontend_tests/node_tests/unread.js index c53e1112ba..04a5eec1fa 100644 --- a/frontend_tests/node_tests/unread.js +++ b/frontend_tests/node_tests/unread.js @@ -623,4 +623,3 @@ run_test('errors', () => { assert.equal(counts.private_message_count, 0); test_notifiable_count(counts.home_unread_messages, 0); }); - diff --git a/puppet/zulip/files/cron.d/update-analytics-counts b/puppet/zulip/files/cron.d/update-analytics-counts index b5b9b4e4b7..5175c6bd0b 100644 --- a/puppet/zulip/files/cron.d/update-analytics-counts +++ b/puppet/zulip/files/cron.d/update-analytics-counts @@ -4,4 +4,3 @@ USER=zulip # Run update analytics tables every 5 minutes past the hour 5 * * * * zulip /home/zulip/deployments/current/manage.py update_analytics_counts - diff --git a/puppet/zulip_ops/files/motd.lb0 b/puppet/zulip_ops/files/motd.lb0 index ec5fa4a5b5..08c3021a8b 100644 --- a/puppet/zulip_ops/files/motd.lb0 +++ b/puppet/zulip_ops/files/motd.lb0 @@ -11,4 +11,3 @@ To connect to an app server, you need to run: ssh .zulip.net Note the .net, not the .com. - diff --git a/puppet/zulip_ops/files/munin/apache.conf b/puppet/zulip_ops/files/munin/apache.conf index 268404f2b1..c6f30e7f25 100644 --- a/puppet/zulip_ops/files/munin/apache.conf +++ b/puppet/zulip_ops/files/munin/apache.conf @@ -90,4 +90,3 @@ ScriptAlias /munin-cgi/munin-cgi-html /usr/lib/munin/cgi/munin-cgi-html SetHandler cgi-script - diff --git a/puppet/zulip_ops/files/nagios3/nagios.cfg b/puppet/zulip_ops/files/nagios3/nagios.cfg index c023682983..293d7f1992 100644 --- a/puppet/zulip_ops/files/nagios3/nagios.cfg +++ b/puppet/zulip_ops/files/nagios3/nagios.cfg @@ -1353,4 +1353,3 @@ debug_file=/var/log/nagios3/nagios.debug max_debug_file_size=1000000 allow_empty_hostgroup_assignment=1 - diff --git a/scripts/README.md b/scripts/README.md index a0ae14cd5b..5da531cd60 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -9,4 +9,3 @@ This directory contains scripts that: For more details, see https://zulip.readthedocs.io/en/latest/overview/directory-structure.html. - diff --git a/templates/zerver/help/include/webhook-url-with-bot-email.md b/templates/zerver/help/include/webhook-url-with-bot-email.md index 3fe54ada9f..894b3c22f9 100644 --- a/templates/zerver/help/include/webhook-url-with-bot-email.md +++ b/templates/zerver/help/include/webhook-url-with-bot-email.md @@ -5,5 +5,3 @@ In the URL field, enter: Replace `bot_email` and `bot_api_key` above with the URL-encoded email address and API key of the bot. To URL-encode the email address, you just need to replace `@` in the bot's email address with `%40`. - - diff --git a/tools/README.md b/tools/README.md index fe3b9d5f33..a34de288c6 100644 --- a/tools/README.md +++ b/tools/README.md @@ -5,4 +5,3 @@ Note that tools that are also useful in production belong in For more details, see https://zulip.readthedocs.io/en/latest/overview/directory-structure.html. - diff --git a/zerver/webhooks/raygun/fixtures/comment_added_to_error.json b/zerver/webhooks/raygun/fixtures/comment_added_to_error.json index fb8a6991c7..ea3c4059e6 100644 --- a/zerver/webhooks/raygun/fixtures/comment_added_to_error.json +++ b/zerver/webhooks/raygun/fixtures/comment_added_to_error.json @@ -14,4 +14,3 @@ "url":"http://app.raygun.io/application-url" } } - diff --git a/zerver/webhooks/raygun/fixtures/error_assigned_to_user.json b/zerver/webhooks/raygun/fixtures/error_assigned_to_user.json index d896131952..25aa2222b1 100644 --- a/zerver/webhooks/raygun/fixtures/error_assigned_to_user.json +++ b/zerver/webhooks/raygun/fixtures/error_assigned_to_user.json @@ -14,4 +14,3 @@ "url":"http://app.raygun.io/application-url" } } - diff --git a/zerver/webhooks/raygun/fixtures/error_status_changed.json b/zerver/webhooks/raygun/fixtures/error_status_changed.json index 47c7530c38..18e161c05c 100644 --- a/zerver/webhooks/raygun/fixtures/error_status_changed.json +++ b/zerver/webhooks/raygun/fixtures/error_status_changed.json @@ -14,4 +14,3 @@ "url":"http://app.raygun.io/application-url" } } - diff --git a/zerver/webhooks/raygun/fixtures/hourly_followup_error.json b/zerver/webhooks/raygun/fixtures/hourly_followup_error.json index 3472b29990..2b33705765 100644 --- a/zerver/webhooks/raygun/fixtures/hourly_followup_error.json +++ b/zerver/webhooks/raygun/fixtures/hourly_followup_error.json @@ -14,4 +14,3 @@ "url":"http://app.raygun.io/application-url" } } - diff --git a/zerver/webhooks/raygun/fixtures/new_error.json b/zerver/webhooks/raygun/fixtures/new_error.json index b345ff0e97..584ef3daba 100644 --- a/zerver/webhooks/raygun/fixtures/new_error.json +++ b/zerver/webhooks/raygun/fixtures/new_error.json @@ -31,4 +31,3 @@ "url":"http://app.raygun.io/application-url" } } - diff --git a/zerver/webhooks/raygun/fixtures/one_minute_followup_error.json b/zerver/webhooks/raygun/fixtures/one_minute_followup_error.json index c54768a8a6..8b30e2740f 100644 --- a/zerver/webhooks/raygun/fixtures/one_minute_followup_error.json +++ b/zerver/webhooks/raygun/fixtures/one_minute_followup_error.json @@ -14,4 +14,3 @@ "url":"http://app.raygun.io/application-url" } } - diff --git a/zerver/webhooks/raygun/fixtures/reoccurred_error.json b/zerver/webhooks/raygun/fixtures/reoccurred_error.json index e6a5dd76e5..b534b201bc 100644 --- a/zerver/webhooks/raygun/fixtures/reoccurred_error.json +++ b/zerver/webhooks/raygun/fixtures/reoccurred_error.json @@ -31,4 +31,3 @@ "url":"http://app.raygun.io/application-url" } } - diff --git a/zerver/webhooks/stripe/fixtures/customer_created.json b/zerver/webhooks/stripe/fixtures/customer_created.json index e5cc27559e..18158d055a 100644 --- a/zerver/webhooks/stripe/fixtures/customer_created.json +++ b/zerver/webhooks/stripe/fixtures/customer_created.json @@ -39,4 +39,3 @@ } } } - diff --git a/zerver/webhooks/trello/fixtures/changing_description_on_card.json b/zerver/webhooks/trello/fixtures/changing_description_on_card.json index 92d8b4c2ac..78919f7245 100644 --- a/zerver/webhooks/trello/fixtures/changing_description_on_card.json +++ b/zerver/webhooks/trello/fixtures/changing_description_on_card.json @@ -94,4 +94,3 @@ } } } - diff --git a/zerver/webhooks/trello/fixtures/removing_description_from_card.json b/zerver/webhooks/trello/fixtures/removing_description_from_card.json index 30f3c7d249..2a29c9d8f3 100644 --- a/zerver/webhooks/trello/fixtures/removing_description_from_card.json +++ b/zerver/webhooks/trello/fixtures/removing_description_from_card.json @@ -94,4 +94,3 @@ } } } -