paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 21:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove some some duplicate words in copy.

Browse Source
This commit is contained in:
Eitan Adler
2017-01-23 23:11:59 -08:00
committed by Tim Abbott
parent 126b1c4edc
commit 0ce29d7ad6
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/using-dev-environment.md
View File

@@ -28,7 +28,7 @@ changes take effect. The Handlebars frontend HTML templates
`tools/compile-handlebars-templates` job, which runs as part of `tools/compile-handlebars-templates` job, which runs as part of
`tools/run-dev.py`. `tools/run-dev.py`.
* If you change Python code used by the the main Django/Tornado server * If you change Python code used by the main Django/Tornado server
processes, these services are run on top of Django's [manage.py processes, these services are run on top of Django's [manage.py
runserver][django-runserver] which will automatically restart the runserver][django-runserver] which will automatically restart the
Zulip Django and Tornado servers whenever you save changes to Python Zulip Django and Tornado servers whenever you save changes to Python

2
puppet/stdlib/spec/functions/ensure_resource_spec.rb
View File

@@ -12,7 +12,7 @@ describe 'ensure_resource' do
let :pre_condition do let :pre_condition do
'user { "dan": }' 'user { "dan": }'
end end
it "should contain the the ensured resources" do it "should contain the ensured resources" do
subject.should run.with_params('user', 'dan', {}) subject.should run.with_params('user', 'dan', {})
compiler.catalog.resource('User[dan]').to_s.should == 'User[dan]' compiler.catalog.resource('User[dan]').to_s.should == 'User[dan]'
end end

2
static/js/compose.js
View File

@@ -634,7 +634,7 @@ exports.respond_to_message = function (opts) {
var pm_recipient = message.reply_to; var pm_recipient = message.reply_to;
if (opts.reply_type === "personal" && message.type === "private") { if (opts.reply_type === "personal" && message.type === "private") {
// reply_to for private messages is everyone involved, so for // reply_to for private messages is everyone involved, so for
// personals replies we need to set the the private message // personals replies we need to set the private message
// recipient to just the sender // recipient to just the sender
pm_recipient = message.sender_email; pm_recipient = message.sender_email;
} }

2
templates/zerver/integrations.html
View File

@@ -617,7 +617,7 @@
<p>In the next screen, provide the details. First, click Add Actions to <p>In the next screen, provide the details. First, click Add Actions to
display the rule actions. Select "Trigger an App Action" in the dropdown, and display the rule actions. Select "Trigger an App Action" in the dropdown, and
then the name of the custom action you created earlier when the the second then the name of the custom action you created earlier when the second
dropdown appears. You can add additional "All" or "Any" conditions if desired. dropdown appears. You can add additional "All" or "Any" conditions if desired.
Also select when the rule should run (if not "Anytime") and enable it.</p> Also select when the rule should run (if not "Anytime") and enable it.</p>