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.

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

Improve streaming API server performance with cluster #1970

Merged
merged 1 commit into from Apr 17, 2017

Conversation

Projects
None yet
2 participants
@geta6
Contributor

geta6 commented Apr 17, 2017

I added the code from line 19 to line 33 of index.js. (other changes are indentation)

  • It automatically restarts when node dies
  • By using multiple clusters, CPU resources can be used efficiently

In order to make the default behavior the same as before, the number of clusters is set to 1 as the default value.

(This is a summary of the commit code used in pawoo.net)

@geta6 geta6 changed the title from Improve streaming server with cluster to Improve streaming server performance with cluster Apr 17, 2017

@geta6 geta6 changed the title from Improve streaming server performance with cluster to Improve streaming API server performance with cluster Apr 17, 2017

@Gargron

Very interesting!

I have been load-balancing traffic between 4 different streaming API servers on 4 different machines on mastodon.social. Your PR allows the same effect to be achieved on a single machine without much effort. Very nice!

@Gargron Gargron merged commit 64e1d51 into tootsuite:master Apr 17, 2017

2 checks passed

codeclimate no new or fixed issues
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@geta6 geta6 deleted the geta6:feature/streaming_server_cluster branch Apr 17, 2017

nolanlawson added a commit to tootcafe/mastodon that referenced this pull request Apr 20, 2017

Mastodon v1.2.2 (#8)
* cache blockings for reducing queries.

* Improved Japanese translation in devise.ja.yml (tootsuite#1969)

* Fix minor typo in Japanese translation "保村" -> "保存" (tootsuite#1968)

* reduce unneed query when post without attachements. (tootsuite#1907)

* reduce unneed query when post without attachements.

This commit reduce following query:

```
 MediaAttachment Load (0.9ms)  SELECT "media_attachments".* FROM "media_attachments" WHERE "media_attachments"."status
_id" IS NULL AND 1=0 ORDER BY id asc
```

* fixed for more simple changes.

* Improve streaming server with cluster (tootsuite#1970)

* Assign user locale on signup (tootsuite#1982)

* Fix tiny typo (tootsuite#1956)

* Fix tiny typo, and added link to terms and conditions in confirmation email for Japanese. (tootsuite#1975) (tootsuite#1975)

* Improved Japanese translation in ja.yml (tootsuite#1981)

* Add function color remaining text (tootsuite#1980)

* Add human locales for zh-tw (tootsuite#1984)

* Rubocop instructions (tootsuite#1973)

* Rubocop link for Sublime Text

* Fix rubocop links

* Link to gh issues page from contributing doc

* Optimize user setting page for mobile browser (tootsuite#1924)

* Remove overflow because it blocks scrolling on mobile safari.

* Add “-webkit-overflow-scrolling: touch;” to enable smooth scroll on mobile safari and other webkit browsers.

* Use radio buttons in user setting page.

Because select tags with long text are not fit in the width of mobile devices.

* Add flex property to fit labels to devise width.

* Change font size of select.

It causes auto zooming on mobile safari.

* Create hr.jsx (tootsuite#1945)

* Create hr.jsx

Start of Croatian translation

* Update settings_helper.rb

* Update application.rb

* Update application.rb

* Update index.jsx

* Add Brazilian Portuguese and fix European Portuguese (tootsuite#1966)

* update portuguese translation

added the missing fields and improved the translation

* pt translations fix

* improve last translation commit

* fix damn quotes

* add pt_br to index.jsx

* add pt-BR to import index.jsx

* add pt-BR to mastodon.jsx

* add pt-BR to settings_helper.rb

* add pt-BR to application.rb

* order alphabetically pt.jsx

* create pt-BR.jsx

* Create devise.pt-BR.yml

* language improvements to devise.pt.yml

* created doorkeeper.pt-BR.yml

* fixes to doorkeeper.pt.yml

* create pt-BR.yml

* improvements to pt.yml

* Create simple_form.pt-BR.yml

* Improvements to simple_form.pt.yml

* improvements to pt.yml

* Added missing `rake secret` command (tootsuite#1894)

* Add mask-icon.svg (tootsuite#1572) (tootsuite#1585)

* Add mask-icon (tootsuite#1572)

* use updated svg logo for mask-icon

* NFS for shared folder requires a private_network (tootsuite#1263)

* Allow using an SMTP server without authentication (tootsuite#1597)

* Allow using an SMTP server without authentication (e.g Postfix relay on the same host) by setting SMTP_LOGIN and SMTP_AUTH_METHOD to 'none'

* Add note in .env.production.sample about SMTP settings for servers where no auth is required

* Assume that SMTP_LOGIN and SMTP_PASSWORD will be blank if we set SMTP_AUTH_METHOD to none

* Add documentation of SMTP_DOMAIN (tootsuite#1738)

Without setting it, exim will reject the mail with a message like:
rejected EHLO from [10.20.0.1]: syntactically invalid argument(s): {}

* Add gif auto-play/pause preference

This introduces a new per-user preference called
"Auto-play animated GIFs", which is enabled by default. When a
user disables this setting, gifs in toots become click-to-play.

Previews of animated gifs were changed to display the video play
button so that users can distinguish them from regular images.

This setting also affects account avatars in the detailed account
view, which was changed to use the same hover-to-play mechanism
that is used for animated avatars in timelines.

Fixes tootsuite#1652

* Open sidekiq and pghero admin pages in new browser tabs (tootsuite#1596)

* Open sidekiq and pghero admin pages in new tabs

* Add missing comma

* Make contents of boost confirmation dialog scroll (tootsuite#1710)

This is necessary for boosting long posts on small screens - see this post for video: https://slime.global/@masklayer/102308

* Update fr.jsx "clear" (Nettoyer peut-être ambigu) (tootsuite#1987)

Un utiliser mal expérimenté pourrait comprendre "retirer les erreurs".
Ici il s'agit d'une suppression pure et simple, pas une épuration/nettoyage.

clear would be translated "remove" instead of "cleaning" Cleaning can be unterstood "keep but clean"

* Update Japanese translation (tootsuite#1993)

Sync text for toot form

* Required foreign keys (tootsuite#2003)

* Add `required: true` option to foreign column

* Fixes NoMethodError

```
> Favourite.new.valid?
NoMethodError: undefined method `reblog?' for nil:NilClass
```

* Fix nil query_username (tootsuite#2013)

* Improve handling of HTTP_ACCEPT for webfinger (tootsuite#2008)

This change includes:

- Improve the spec coverage for incoming request to the webfinger action
- For requests without an accept header (ie, what a browser might look like),
  return a JSON response.
- For requests with an explicit format of xml or json, return that format.
- For requests using an accept header, return that format.

Also adds failing spec showing webfinger does not return xml, which covers the
issue described in: tootsuite#1983

* Fix tootsuite#1897 - Return reblogged: false on unreblog (was wrongly named variable) (tootsuite#1989)

* Fix tootsuite#1972, fix tootsuite#1870 - Fix special characters in XML, add tests (tootsuite#1988)

Also improve efficiency of the mastodon:maintenance:add_static_avatars task

* Media controller specs (tootsuite#2022)

* Add spec for media controller

* Add MediaAttachment.attached scope

* Simplify methods in media controller

* Remove i18n_spec file (tootsuite#2014)

These were being skipped with `xit`, but we also just added the `unused` task to
the CI server, and it will be caught there. That seems good enough for this,
instead of requiring a full keys check on every local spec suite run.

* French i18n-tasks missing fr (tootsuite#2018)

* Return early from submit if no text. (tootsuite#1962)

* Fix import pt_br locale in mastodon.jsx (tootsuite#2011)

* README tidy up (tootsuite#2026)

* Remove docker guide and put it in docs repo

* Move tasks to docs repo

* Move requirements to contributing doc

* Move advice about tagged releases to docs repo

* Move local domain and host config to docs repo

* Link to related tech

* optimized logo (tootsuite#2020)

- adjusted elements to fit the pixel grid for better scaling
- optimized the PNG asset and the SVG asset

* Use .presence instead of ternary on site description for og: content (tootsuite#2033)

* Updated, improved and fixed Dutch language strings (tootsuite#2030)

* Fixed some words

* Improved and more consistent

* Fixes and a bit less 'je'

* Improved and more consistent

* Another round of improvements and consistency

* More improvements and less 'je'

* Update

* Updated with admin strings

* More improvements and additions - not complete yet, but most is there

* This is what we call in Dutch 'the English disease' :-)

* fix comma

* admin.reportsi

* not needed

* hopefully now fixed

* Instance helper to replace site title helper (tootsuite#2038)

* Move site title helper to instance helper (name change only)

* Remove newline in <title> tag

* Add site_hostname helper method to wrap up local_domain value

* Use site_hostname helper in places that need local_domain value

* Add simplified Chinese js translation (tootsuite#2044)

This single-file commit, heavily based on the zh-hk version as of
ec9999c, fixes the missing js locale. Intentional, significant
departures from current zh-cn yml localizations have been marked with
rationales given.

* Add FR locales to the onboarding modal (tootsuite#1976)

* Add FR locale for the onboarding modal component

* Slightly increase the max-width and max-height of the onboarding modal

This is done so it doesn't break with locales whose strings would be
too long

* Update FR locales for onboarding upon PR comments

* Ignore /vendor/bundle (tootsuite#1880)

* Add forgotten AtomSerializer spec (tootsuite#2047)

* Rename cache key to exclude_account_ids_for:id, adjust formatting

* Remove unused methods (tootsuite#1730)

* Remove unused method #set_counters_maps from api controller

* Remove unused method #set_account_counters_maps from api controller

* Remove unused method Account#followers_domains

* Remove unused User.prolific scope

* Add mastodon:users:admins task to list all admin emails

* Use interpolated query style in Account.triadic_closures

* Coverage for Account.triadic_closures

* Adjust visuals of non-autoplaying GIFV

* Add hasMore field to account timeline (tootsuite#2066)

* Update Russian translation (tootsuite#1967)

* Add Russian translation (ru)

* Fix a missing comma

* Fix the wording for better consistency

* Update Russian translation

* Arrange Russian setting alphabetically

* Fix syntax error

* Update Russian translation

* Fix formatting error

* Update Russian translation

* Update Russian translation

* Update ru.jsx

* Fix syntax error

* Remove two_factor_auth.warning (appears obsolete)

* Add missing strings in ru.yml

A lot of new strings translated, especially for the newly added admin section

* Fix translation consistency

* Add Occitan (oc) translation (tootsuite#2077)

* Added oc.yml

* Added `config/locales/oc.yml`.
  Translated in General Occitan (Quent-in).

* Added oc.jsx (Occitan translation)

* Written in General Occitan (lengadocian)
* Added `app/assets/javascripts/components/locales/oc.js`

* Added doorkeeper.oc.yml

* Added `config/locales/doorkeeper.oc.yml` (Quent-in)

* Added simple_form.oc.yml

* Added `config/locales/simple_form.oc.yml` (Quent-in).

* Merge en.yml changes into oc.yml

Added new strings for translations

* Fix typo in oc.yml

* Update javascript locale support (oc)

* Update ruby locale list (oc)

* Fix oc.yml

* Remove obsoleted translations
* Moved old translation of `reports` to `admin.reports`

* French translation update (tootsuite#2063)

fixes

* Fix header icons in navigation bar (tootsuite#2081)

* Avoid dynamic methods due to processing speed (tootsuite#2080)

* Fix streaming server worker count (tootsuite#2082)

* Make sure we start at least one streaming worker, even if there's only one CPU and we're in production mode.

* Oops, let's make sure we're counting cpus right too.

* Translate onboarding dialog to japanese (tootsuite#2062)

* translate onboarding modal to japanese

* fixed translation by feedback

* Add "Mastodon" to user agent (tootsuite#2073)

Remove non-const version string

Freeze option is unnecessary

* Update storybook file autoload (tootsuite#2057)

* Simplify renders in views (tootsuite#2084)

* Simplify render in mailer views

* Simplify render in about/more view

* Simplify render in accounts follow views

* Simplify render in recovery code views

* Simplify render in stream entry embed

* Simplify render in stream entries status partial

* Simplify render in authorize follow new view

* Moving aria-label to div.column (tootsuite#1769)

* Use landmark regions on columns

Closes mastodon#1720

* Moving aria-label to div.column

* fix admin input display (tootsuite#1633)

* Disable toot button when above 500 characters (tootsuite#2088)

* Disable toot button when above 500 characters

* Consider multibyte characters

* Consider spoiler_text

* Admin reports with accounts (tootsuite#2092)

* Add a ReportFilter class

* Add reports and targeted_reports relationships to Account

* Use ReportFilter from admin/reports controller

* Link to admin/reports filtered views from admin account show view

* Add indexes to reports.account_id and reports.target_account_id

* Instances list in admin (tootsuite#2095)

* Add admin/instances index action

* Add link to instances admin page

* View lists instances

* Instances, grouped by domain, ordered by count

* Use Account.remote scope

* Extract method: Account.by_domain_accounts

* Polish zh-cn js translation (tootsuite#2090)

* Polish zh-cn js translation

* fixes for problems pointed out by gumblex in tootsuite#2044
* more effectively differentiate between following/follower

* Fix missing period (zh-cn js)

Maybe squash this commit?

* Fix duplicate word (zh-cn js)

* Remove API authentication for public statuses (after review) (tootsuite#1919)

* Language detection refactor (tootsuite#2099)

* Extract detect_language to separate class

* Use default locale, not just en

* Add spec to confirm that whatlanguage cant identify empty string

* Allow account locale to override default in language detector

* PostStatusService supplies an account to detect language

* Add rate limits for logins and sign-ups by IP (5 in 5 minutes) (tootsuite#2079)

* Add rate limits for logins and sign-ups by IP (5 in 5 minutes)
Should be enough for normal attempts

* Add rate limit for forgotten password form as well

* missing translate ja.yml (tootsuite#2100)

* Add more tests for AtomSerializer (tootsuite#2096)

* Fix tootsuite#1642, fix tootsuite#1912 - Dictate content-type file extension (tootsuite#2078)

* Fix tootsuite#1642, fix tootsuite#1912 - Previous change (tootsuite#1718) did not modify how original file was saved on upload

* Fix for when file is missing

* Remove unused fonts (tootsuite#2103)

* Fix wording on admin instances view, fix typos in language detector spec (tootsuite#2106)

* Update fr.yml (tootsuite#2107)

Just updated some values.
Best regards,
cyweo

* update ja.yml (follow for tootsuite#2106) (tootsuite#2109)

* update simple_form.ja.yml (follow for tootsuite#1991) (tootsuite#2113)

* Update ja.yml (follow for tootsuite#2118) (tootsuite#2137)

* Update ja.yml (follow for tootsuite#2118)

* typo fix

* Restful refactor of accounts/ routes (tootsuite#2133)

* Add routing specs for accounts followers and following actions

* Use more restful route naming for public account follow pages

Moves two actions:
- accounts#followers to accounts/follower_accounts#index
- accounts#following to accounts/following_accounts#index

Adds routing spec to ensure prior URLs are preserved.

* Change to switch signature version for Amazon S3 (tootsuite#2124)

* Update title text for "reply all" button (tootsuite#2118)

* Make configuarable s3_permissions for paperclip (tootsuite#2139)

* Improve visibility of mute, block, report menu in Japanese (tootsuite#2131)

* Moves from hamburger icon to asterisk. (tootsuite#2116)

* Do not show link preview card if toot has a spoiler (tootsuite#1617)

* Do not show link preview card if toot has a spoiler

* == to ===

* capistrano: link robots.txt (tootsuite#1576)

Related to tootsuite#1533.

* Install Yarn dependencies during setup (tootsuite#1169)

Previously the `bin/setup` script only installed the Ruby dependencies
via Bundler. This is not sufficient to get the test suite to pass. We
also need the JavaScript dependencies.

This commit installs the JavaScript dependencies as part of the
`bin/setup` script via Yarn.

This allows for a successful

    bin/setup && bundle exec rake

on a fresh clone of the repo.

* enable to scroll the setting's page sidebar (tootsuite#1347)

* enable to scroll the setting's page sidebar

add scroll:auto and use margin instead of padding for the bottom

* Update admin.scss

* Update admin.scss

* Update admin.scss

* Fix html escape characters in the URL (tootsuite#2138)

* fix character escaping in URL

* add tests

* put a comma after the last item

* add HTML escape test

* Remove unnecessary word from Japanese locale (tootsuite#2143)

* Replace User.count -> User.confirmed.count (tootsuite#2127)

* Attachment list for uncached attachments (tootsuite#2110)

* For undownloaded attachments, set type :unknown, display them as a list in the web UI

* Fix case when attachment type is set explicitly

* Simplify render in controllers (tootsuite#2144)

* Automatically change the size of textarea (tootsuite#2128)

* fix search text 'zero' (tootsuite#2150)

* Completed Italian translation (tootsuite#2151)

* Added it.jsx

* Update index.jsx

* Update mastodon.jsx

* fix Japanese search result translation (tootsuite#2149)

add 'result' mean, '件' only mean count unit.

* Add meta tags for OGP to following & follow page (tootsuite#2052)

* Add meta tags for OGP to following & follow page

* simplify render helper

* Follow up tootsuite#2133

* og:type is only accounts/show

* revert accounts/{following,followers}

* Remove unused view files in accounts/ (tootsuite#2153)

* Fix possibility of unrightful webfinger redirect (tootsuite#2147)

* Fix possibility of unrightful webfinger redirect

* Add more tests for FollowRemoteAccountService

* Fix double-escaping of display names in <title> (tootsuite#2155)

* fix broken style when follower has long description (tootsuite#2159)

* Fix css for toot button when uploading images (tootsuite#2161)

* Fixed hungarian translation (tootsuite#2158)

* Dutch language strings: a few important fixes (tootsuite#2163)

* Extract error messages to locale file (tootsuite#2162)

* Add some Spanish translatoins (tootsuite#2170)

* Updated note about 'none' SMTP authentication method in .env.production.sample (tootsuite#2167)

* Fix tootsuite#2108 - Fix gif uploads (tootsuite#2171)

* Fix tootsuite#2108 - Fix gif uploads
Add specs for media attachment gifv conversion

* Add ffmpeg to travis

* Make travis install ffmpeg, not libav

* Switch travis to trusty

3846masa added a commit to 3846masa-tmp/mastodon that referenced this pull request Apr 27, 2017

Merged v1.2.2
Squashed commit of the following:

commit 2e4afcc
Author: Eugen <eugen@zeonfederated.com>
Date:   Wed Apr 19 23:21:00 2017 +0200

    Fix tootsuite#2108 - Fix gif uploads (tootsuite#2171)

    * Fix tootsuite#2108 - Fix gif uploads
    Add specs for media attachment gifv conversion

    * Add ffmpeg to travis

    * Make travis install ffmpeg, not libav

    * Switch travis to trusty

commit 0876a06
Author: evilny0 <evilny0@moomoocamp.net>
Date:   Wed Apr 19 23:16:43 2017 +0200

    Updated note about 'none' SMTP authentication method in .env.production.sample (tootsuite#2167)

commit 43caf1f
Author: Darshak Parikh <dar5hak@users.noreply.github.com>
Date:   Thu Apr 20 01:49:41 2017 +0530

    Add some Spanish translatoins (tootsuite#2170)

commit 2c0d756
Author: alpaca-tc <alpaca-tc@alpaca.tc>
Date:   Thu Apr 20 05:19:32 2017 +0900

    Extract error messages to locale file (tootsuite#2162)

commit f06cba3
Author: jeroenpraat <jeroenpraat@users.noreply.github.com>
Date:   Wed Apr 19 22:19:19 2017 +0200

    Dutch language strings: a few important fixes (tootsuite#2163)

commit 09dad88
Author: György Nádudvari <reedcourty@users.noreply.github.com>
Date:   Wed Apr 19 19:21:44 2017 +0200

    Fixed hungarian translation (tootsuite#2158)

commit 7832425
Author: Tomohiro Suwa <neoen.gsn@gmail.com>
Date:   Thu Apr 20 02:21:23 2017 +0900

    Fix css for toot button when uploading images (tootsuite#2161)

commit abe16a7
Author: fsubal <fsubal@users.noreply.github.com>
Date:   Thu Apr 20 02:20:51 2017 +0900

    fix broken style when follower has long description (tootsuite#2159)

commit baabbce
Author: Eugen <eugen@zeonfederated.com>
Date:   Wed Apr 19 17:46:24 2017 +0200

    Fix double-escaping of display names in <title> (tootsuite#2155)

commit 1d47910
Author: Eugen <eugen@zeonfederated.com>
Date:   Wed Apr 19 17:28:35 2017 +0200

    Fix possibility of unrightful webfinger redirect (tootsuite#2147)

    * Fix possibility of unrightful webfinger redirect

    * Add more tests for FollowRemoteAccountService

commit 708bdd5
Author: Matt Jankowski <mjankowski@thoughtbot.com>
Date:   Wed Apr 19 11:19:23 2017 -0400

    Remove unused view files in accounts/ (tootsuite#2153)

commit 2510119
Author: Yamagishi Kazutoshi <ykzts@desire.sh>
Date:   Thu Apr 20 00:17:32 2017 +0900

    Add meta tags for OGP to following & follow page (tootsuite#2052)

    * Add meta tags for OGP to following & follow page

    * simplify render helper

    * Follow up tootsuite#2133

    * og:type is only accounts/show

    * revert accounts/{following,followers}

commit fe1ddc3
Author: matsurai25 <souta.m825@gmail.com>
Date:   Wed Apr 19 23:41:30 2017 +0900

    fix Japanese search result translation (tootsuite#2149)

    add 'result' mean, '件' only mean count unit.

commit a3486e0
Author: Matteo Aquila <matteoaquila@users.noreply.github.com>
Date:   Wed Apr 19 16:40:45 2017 +0200

    Completed Italian translation (tootsuite#2151)

    * Added it.jsx

    * Update index.jsx

    * Update mastodon.jsx

commit 30183c0
Author: matsurai25 <souta.m825@gmail.com>
Date:   Wed Apr 19 23:40:24 2017 +0900

    fix search text 'zero' (tootsuite#2150)

commit 15a4fc5
Author: geta6 <getakura@gmail.com>
Date:   Wed Apr 19 22:39:46 2017 +0900

    Automatically change the size of textarea (tootsuite#2128)

commit a8e1afc
Author: Matt Jankowski <mjankowski@thoughtbot.com>
Date:   Wed Apr 19 09:37:42 2017 -0400

    Simplify render in controllers (tootsuite#2144)

commit bfbc2ca
Author: Eugen <eugen@zeonfederated.com>
Date:   Wed Apr 19 15:37:18 2017 +0200

    Attachment list for uncached attachments (tootsuite#2110)

    * For undownloaded attachments, set type :unknown, display them as a list in the web UI

    * Fix case when attachment type is set explicitly

commit 5ce8a18
Author: alpaca-tc <alpaca-tc@alpaca.tc>
Date:   Wed Apr 19 21:58:27 2017 +0900

    Replace User.count -> User.confirmed.count (tootsuite#2127)

commit dca0ffa
Author: Yamagishi Kazutoshi <ykzts@desire.sh>
Date:   Wed Apr 19 21:54:47 2017 +0900

    Remove unnecessary word from Japanese locale (tootsuite#2143)

commit 70891a9
Author: abcang <abcang1015@gmail.com>
Date:   Wed Apr 19 21:52:18 2017 +0900

    Fix html escape characters in the URL (tootsuite#2138)

    * fix character escaping in URL

    * add tests

    * put a comma after the last item

    * add HTML escape test

commit 3572f44
Author: 857b <benjamin.bonneau74@gmail.com>
Date:   Wed Apr 19 14:30:23 2017 +0200

    enable to scroll the setting's page sidebar (tootsuite#1347)

    * enable to scroll the setting's page sidebar

    add scroll:auto and use margin instead of padding for the bottom

    * Update admin.scss

    * Update admin.scss

    * Update admin.scss

commit 23eea5c
Author: Joël Quenneville <joel.quen@gmail.com>
Date:   Wed Apr 19 08:29:23 2017 -0400

    Install Yarn dependencies during setup (tootsuite#1169)

    Previously the `bin/setup` script only installed the Ruby dependencies
    via Bundler. This is not sufficient to get the test suite to pass. We
    also need the JavaScript dependencies.

    This commit installs the JavaScript dependencies as part of the
    `bin/setup` script via Yarn.

    This allows for a successful

        bin/setup && bundle exec rake

    on a fresh clone of the repo.

commit 35bdacb
Author: Alex Dunn <dunn.alex@gmail.com>
Date:   Wed Apr 19 05:28:23 2017 -0700

    capistrano: link robots.txt (tootsuite#1576)

    Related to tootsuite#1533.

commit 9701248
Author: Isabelle Knott <isabelle@blackle-mori.com>
Date:   Wed Apr 19 08:28:00 2017 -0400

    Do not show link preview card if toot has a spoiler (tootsuite#1617)

    * Do not show link preview card if toot has a spoiler

    * == to ===

commit 9a7ea7c
Author: Ash Furrow <ash@ashfurrow.com>
Date:   Wed Apr 19 08:21:14 2017 -0400

    Moves from hamburger icon to asterisk. (tootsuite#2116)

commit 1ac41c8
Author: chrolis <chrolis@users.noreply.github.com>
Date:   Wed Apr 19 21:21:00 2017 +0900

    Improve visibility of mute, block, report menu in Japanese (tootsuite#2131)

commit 6c83fec
Author: tmyt <shigure@refy.net>
Date:   Wed Apr 19 21:20:36 2017 +0900

    Make configuarable s3_permissions for paperclip (tootsuite#2139)

commit 2bb54d5
Author: Misty De Meo <mistydemeo@github.com>
Date:   Wed Apr 19 20:20:04 2017 +0800

    Update title text for "reply all" button (tootsuite#2118)

commit 8b8e140
Author: Yamagishi Kazutoshi <ykzts@desire.sh>
Date:   Wed Apr 19 21:18:50 2017 +0900

    Change to switch signature version for Amazon S3 (tootsuite#2124)

commit 8bac035
Author: Matt Jankowski <mjankowski@thoughtbot.com>
Date:   Wed Apr 19 07:52:37 2017 -0400

    Restful refactor of accounts/ routes (tootsuite#2133)

    * Add routing specs for accounts followers and following actions

    * Use more restful route naming for public account follow pages

    Moves two actions:
    - accounts#followers to accounts/follower_accounts#index
    - accounts#following to accounts/following_accounts#index

    Adds routing spec to ensure prior URLs are preserved.

commit c0b30c5
Author: Kota Ouchi <k0ta0uchi@gmail.com>
Date:   Wed Apr 19 20:44:07 2017 +0900

    Update ja.yml (follow for tootsuite#2118) (tootsuite#2137)

    * Update ja.yml (follow for tootsuite#2118)

    * typo fix

commit 0a850a8
Author: Isao Sugimoto <d6rkaiz@gmail.com>
Date:   Wed Apr 19 10:55:19 2017 +0900

    update simple_form.ja.yml (follow for tootsuite#1991) (tootsuite#2113)

commit 71f5cf1
Author: Isao Sugimoto <d6rkaiz@gmail.com>
Date:   Wed Apr 19 07:52:30 2017 +0900

    update ja.yml (follow for tootsuite#2106) (tootsuite#2109)

commit 9d8bf4e
Author: Michel <michel@cyweo.com>
Date:   Wed Apr 19 00:52:19 2017 +0200

    Update fr.yml (tootsuite#2107)

    Just updated some values.
    Best regards,
    cyweo

commit 96268e7
Author: Eugen <eugen@zeonfederated.com>
Date:   Tue Apr 18 23:39:51 2017 +0200

    Fix wording on admin instances view, fix typos in language detector spec (tootsuite#2106)

commit c6a4ab3
Author: Eugen <eugen@zeonfederated.com>
Date:   Tue Apr 18 23:34:50 2017 +0200

    Remove unused fonts (tootsuite#2103)

commit e09ab2c
Author: Eugen <eugen@zeonfederated.com>
Date:   Tue Apr 18 23:15:44 2017 +0200

    Fix tootsuite#1642, fix tootsuite#1912 - Dictate content-type file extension (tootsuite#2078)

    * Fix tootsuite#1642, fix tootsuite#1912 - Previous change (tootsuite#1718) did not modify how original file was saved on upload

    * Fix for when file is missing

commit 6bd1019
Author: Eugen <eugen@zeonfederated.com>
Date:   Tue Apr 18 22:30:17 2017 +0200

    Add more tests for AtomSerializer (tootsuite#2096)

commit 0d6c1e9
Author: Isao Sugimoto <d6rkaiz@gmail.com>
Date:   Wed Apr 19 05:29:39 2017 +0900

    missing translate ja.yml (tootsuite#2100)

commit ff5baa5
Author: Eugen <eugen@zeonfederated.com>
Date:   Tue Apr 18 22:29:14 2017 +0200

    Add rate limits for logins and sign-ups by IP (5 in 5 minutes) (tootsuite#2079)

    * Add rate limits for logins and sign-ups by IP (5 in 5 minutes)
    Should be enough for normal attempts

    * Add rate limit for forgotten password form as well

commit 297c11d
Author: Matt Jankowski <mjankowski@thoughtbot.com>
Date:   Tue Apr 18 16:20:12 2017 -0400

    Language detection refactor (tootsuite#2099)

    * Extract detect_language to separate class

    * Use default locale, not just en

    * Add spec to confirm that whatlanguage cant identify empty string

    * Allow account locale to override default in language detector

    * PostStatusService supplies an account to detect language

commit 0a75882
Author: happycoloredbanana <happycoloredbanana@users.noreply.github.com>
Date:   Tue Apr 18 22:58:57 2017 +0300

    Remove API authentication for public statuses (after review) (tootsuite#1919)

commit 3ed219f
Author: Mingye Wang <arthur200126@gmail.com>
Date:   Tue Apr 18 15:29:31 2017 -0400

    Polish zh-cn js translation (tootsuite#2090)

    * Polish zh-cn js translation

    * fixes for problems pointed out by gumblex in tootsuite#2044
    * more effectively differentiate between following/follower

    * Fix missing period (zh-cn js)

    Maybe squash this commit?

    * Fix duplicate word (zh-cn js)

commit 55e1503
Author: Matt Jankowski <mjankowski@thoughtbot.com>
Date:   Tue Apr 18 15:09:07 2017 -0400

    Instances list in admin (tootsuite#2095)

    * Add admin/instances index action

    * Add link to instances admin page

    * View lists instances

    * Instances, grouped by domain, ordered by count

    * Use Account.remote scope

    * Extract method: Account.by_domain_accounts

commit 66d8f99
Author: Matt Jankowski <mjankowski@thoughtbot.com>
Date:   Tue Apr 18 13:36:18 2017 -0400

    Admin reports with accounts (tootsuite#2092)

    * Add a ReportFilter class

    * Add reports and targeted_reports relationships to Account

    * Use ReportFilter from admin/reports controller

    * Link to admin/reports filtered views from admin account show view

    * Add indexes to reports.account_id and reports.target_account_id

commit f23281e
Author: Tomohiro Suwa <neoen.gsn@gmail.com>
Date:   Wed Apr 19 02:35:55 2017 +0900

    Disable toot button when above 500 characters (tootsuite#2088)

    * Disable toot button when above 500 characters

    * Consider multibyte characters

    * Consider spoiler_text

commit 9783d8b
Author: spf <spf@sanspseudofix.fr>
Date:   Tue Apr 18 17:25:44 2017 +0200

    fix admin input display (tootsuite#1633)

commit 7525971
Author: JP DeVries <mail@devries.jp>
Date:   Tue Apr 18 17:21:25 2017 +0200

    Moving aria-label to div.column (tootsuite#1769)

    * Use landmark regions on columns

    Closes mastodon#1720

    * Moving aria-label to div.column

commit 84b5fae
Author: Matt Jankowski <mjankowski@thoughtbot.com>
Date:   Tue Apr 18 11:15:30 2017 -0400

    Simplify renders in views (tootsuite#2084)

    * Simplify render in mailer views

    * Simplify render in about/more view

    * Simplify render in accounts follow views

    * Simplify render in recovery code views

    * Simplify render in stream entry embed

    * Simplify render in stream entries status partial

    * Simplify render in authorize follow new view

commit d90b165
Author: usagi-f <usagi.f@gmail.com>
Date:   Tue Apr 18 23:04:35 2017 +0900

    Update storybook file autoload (tootsuite#2057)

commit 23ecc68
Author: ik-fib <ik11235@users.noreply.github.com>
Date:   Tue Apr 18 23:04:13 2017 +0900

    Add "Mastodon" to user agent (tootsuite#2073)

    Remove non-const version string

    Freeze option is unnecessary

commit 82bbf57
Author: Keiji, Yoshimi <walf443@gmail.com>
Date:   Tue Apr 18 23:03:27 2017 +0900

    Translate onboarding dialog to japanese (tootsuite#2062)

    * translate onboarding modal to japanese

    * fixed translation by feedback

commit 0790aa9
Author: kuro5hin <rusty@kuro5hin.org>
Date:   Tue Apr 18 09:58:22 2017 -0400

    Fix streaming server worker count (tootsuite#2082)

    * Make sure we start at least one streaming worker, even if there's only one CPU and we're in production mode.

    * Oops, let's make sure we're counting cpus right too.

commit e2a1b57
Author: 839 <8398a7@gmail.com>
Date:   Tue Apr 18 22:57:46 2017 +0900

    Avoid dynamic methods due to processing speed (tootsuite#2080)

commit 880590a
Author: Andrey Blinov <kodnaplakal@gmail.com>
Date:   Tue Apr 18 16:57:16 2017 +0300

    Fix header icons in navigation bar (tootsuite#2081)

commit ee919be
Author: Olivier Humbert <trebmuh@users.noreply.github.com>
Date:   Tue Apr 18 15:21:47 2017 +0200

    French translation update (tootsuite#2063)

    fixes

commit 0a1b024
Author: Koala Yeung <koalay@gmail.com>
Date:   Tue Apr 18 21:21:16 2017 +0800

    Add Occitan (oc) translation (tootsuite#2077)

    * Added oc.yml

    * Added `config/locales/oc.yml`.
      Translated in General Occitan (Quent-in).

    * Added oc.jsx (Occitan translation)

    * Written in General Occitan (lengadocian)
    * Added `app/assets/javascripts/components/locales/oc.js`

    * Added doorkeeper.oc.yml

    * Added `config/locales/doorkeeper.oc.yml` (Quent-in)

    * Added simple_form.oc.yml

    * Added `config/locales/simple_form.oc.yml` (Quent-in).

    * Merge en.yml changes into oc.yml

    Added new strings for translations

    * Fix typo in oc.yml

    * Update javascript locale support (oc)

    * Update ruby locale list (oc)

    * Fix oc.yml

    * Remove obsoleted translations
    * Moved old translation of `reports` to `admin.reports`

commit 50ed727
Author: Ratmir Karabut <rkarabut@users.noreply.github.com>
Date:   Tue Apr 18 16:20:37 2017 +0300

    Update Russian translation (tootsuite#1967)

    * Add Russian translation (ru)

    * Fix a missing comma

    * Fix the wording for better consistency

    * Update Russian translation

    * Arrange Russian setting alphabetically

    * Fix syntax error

    * Update Russian translation

    * Fix formatting error

    * Update Russian translation

    * Update Russian translation

    * Update ru.jsx

    * Fix syntax error

    * Remove two_factor_auth.warning (appears obsolete)

    * Add missing strings in ru.yml

    A lot of new strings translated, especially for the newly added admin section

    * Fix translation consistency

commit 75910ab
Author: geta6 <getakura@gmail.com>
Date:   Tue Apr 18 20:10:49 2017 +0900

    Add hasMore field to account timeline (tootsuite#2066)

commit 93c13fe
Merge: 16d50f6 42d54dc
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue Apr 18 01:58:14 2017 +0200

    Merge branch 'patf-pause-gif'

commit 42d54dc
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue Apr 18 01:57:50 2017 +0200

    Adjust visuals of non-autoplaying GIFV

commit 57d784f
Merge: 16d50f6 ffb9932
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue Apr 18 01:25:50 2017 +0200

    Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif

commit 16d50f6
Author: Matt Jankowski <mjankowski@thoughtbot.com>
Date:   Mon Apr 17 19:21:55 2017 -0400

    Remove unused methods (tootsuite#1730)

    * Remove unused method #set_counters_maps from api controller

    * Remove unused method #set_account_counters_maps from api controller

    * Remove unused method Account#followers_domains

    * Remove unused User.prolific scope

    * Add mastodon:users:admins task to list all admin emails

    * Use interpolated query style in Account.triadic_closures

    * Coverage for Account.triadic_closures

commit 0e0347e
Merge: f03fb6c f5cd0b4
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue Apr 18 01:20:29 2017 +0200

    Merge branch 'pixiv-fix/cache_blocking'

commit f5cd0b4
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue Apr 18 01:14:02 2017 +0200

    Rename cache key to exclude_account_ids_for:id, adjust formatting

commit 2fd0473
Merge: f03fb6c acd3310
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue Apr 18 01:09:57 2017 +0200

    Merge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into pixiv-fix/cache_blocking

commit f03fb6c
Author: Eugen <eugen@zeonfederated.com>
Date:   Tue Apr 18 01:07:46 2017 +0200

    Add forgotten AtomSerializer spec (tootsuite#2047)

commit 8d3412c
Author: Marcin Cieślak <saper@saper.info>
Date:   Tue Apr 18 01:02:50 2017 +0200

    Ignore /vendor/bundle (tootsuite#1880)

commit 9cefb57
Author: Damien Erambert <damien.erambert@me.com>
Date:   Mon Apr 17 16:02:02 2017 -0700

    Add FR locales to the onboarding modal (tootsuite#1976)

    * Add FR locale for the onboarding modal component

    * Slightly increase the max-width and max-height of the onboarding modal

    This is done so it doesn't break with locales whose strings would be
    too long

    * Update FR locales for onboarding upon PR comments

commit 00a85f3
Author: Mingye Wang <arthur200126@gmail.com>
Date:   Mon Apr 17 19:01:32 2017 -0400

    Add simplified Chinese js translation (tootsuite#2044)

    This single-file commit, heavily based on the zh-hk version as of
    ec9999c, fixes the missing js locale. Intentional, significant
    departures from current zh-cn yml localizations have been marked with
    rationales given.

commit 389f8f8
Author: Matt Jankowski <mjankowski@thoughtbot.com>
Date:   Mon Apr 17 18:16:32 2017 -0400

    Instance helper to replace site title helper (tootsuite#2038)

    * Move site title helper to instance helper (name change only)

    * Remove newline in <title> tag

    * Add site_hostname helper method to wrap up local_domain value

    * Use site_hostname helper in places that need local_domain value

commit e1e15ad
Author: jeroenpraat <jeroenpraat@users.noreply.github.com>
Date:   Tue Apr 18 00:16:03 2017 +0200

    Updated, improved and fixed Dutch language strings (tootsuite#2030)

    * Fixed some words

    * Improved and more consistent

    * Fixes and a bit less 'je'

    * Improved and more consistent

    * Another round of improvements and consistency

    * More improvements and less 'je'

    * Update

    * Updated with admin strings

    * More improvements and additions - not complete yet, but most is there

    * This is what we call in Dutch 'the English disease' :-)

    * fix comma

    * admin.reportsi

    * not needed

    * hopefully now fixed

commit f96f8d0
Author: Matt Jankowski <mjankowski@thoughtbot.com>
Date:   Mon Apr 17 17:19:45 2017 -0400

    Use .presence instead of ternary on site description for og: content (tootsuite#2033)

commit a05e758
Author: Sam Hewitt <hewittsamuel@gmail.com>
Date:   Mon Apr 17 15:49:51 2017 -0400

    optimized logo (tootsuite#2020)

    - adjusted elements to fit the pixel grid for better scaling
    - optimized the PNG asset and the SVG asset

commit fc122e9
Author: Matt Jankowski <mjankowski@thoughtbot.com>
Date:   Mon Apr 17 15:28:31 2017 -0400

    README tidy up (tootsuite#2026)

    * Remove docker guide and put it in docs repo

    * Move tasks to docs repo

    * Move requirements to contributing doc

    * Move advice about tagged releases to docs repo

    * Move local domain and host config to docs repo

    * Link to related tech

commit 7d1e653
Author: Andrey Blinov <kodnaplakal@gmail.com>
Date:   Mon Apr 17 22:01:42 2017 +0300

    Fix import pt_br locale in mastodon.jsx (tootsuite#2011)

commit 7b397b1
Author: Zac Anger <zac@zacanger.com>
Date:   Mon Apr 17 12:30:38 2017 -0600

    Return early from submit if no text. (tootsuite#1962)

commit 8fd6552
Author: spf <spf@sanspseudofix.fr>
Date:   Mon Apr 17 20:27:11 2017 +0200

    French i18n-tasks missing fr (tootsuite#2018)

commit 4ed12cd
Author: Matt Jankowski <mjankowski@thoughtbot.com>
Date:   Mon Apr 17 14:02:29 2017 -0400

    Remove i18n_spec file (tootsuite#2014)

    These were being skipped with `xit`, but we also just added the `unused` task to
    the CI server, and it will be caught there. That seems good enough for this,
    instead of requiring a full keys check on every local spec suite run.

commit cc1361c
Author: Matt Jankowski <mjankowski@thoughtbot.com>
Date:   Mon Apr 17 14:02:00 2017 -0400

    Media controller specs (tootsuite#2022)

    * Add spec for media controller

    * Add MediaAttachment.attached scope

    * Simplify methods in media controller

commit 15ec4ae
Author: Eugen <eugen@zeonfederated.com>
Date:   Mon Apr 17 19:58:54 2017 +0200

    Fix tootsuite#1972, fix tootsuite#1870 - Fix special characters in XML, add tests (tootsuite#1988)

    Also improve efficiency of the mastodon:maintenance:add_static_avatars task

commit e43071a
Author: Eugen <eugen@zeonfederated.com>
Date:   Mon Apr 17 19:58:38 2017 +0200

    Fix tootsuite#1897 - Return reblogged: false on unreblog (was wrongly named variable) (tootsuite#1989)

commit 21a767d
Author: Matt Jankowski <mjankowski@thoughtbot.com>
Date:   Mon Apr 17 13:58:03 2017 -0400

    Improve handling of HTTP_ACCEPT for webfinger (tootsuite#2008)

    This change includes:

    - Improve the spec coverage for incoming request to the webfinger action
    - For requests without an accept header (ie, what a browser might look like),
      return a JSON response.
    - For requests with an explicit format of xml or json, return that format.
    - For requests using an accept header, return that format.

    Also adds failing spec showing webfinger does not return xml, which covers the
    issue described in: tootsuite#1983

commit 3399dd7
Author: Tomohiro Suwa <neoen.gsn@gmail.com>
Date:   Tue Apr 18 02:57:02 2017 +0900

    Fix nil query_username (tootsuite#2013)

commit 630de52
Author: alpaca-tc <alpaca-tc@alpaca.tc>
Date:   Mon Apr 17 22:54:33 2017 +0900

    Required foreign keys (tootsuite#2003)

    * Add `required: true` option to foreign column

    * Fixes NoMethodError

    ```
    > Favourite.new.valid?
    NoMethodError: undefined method `reblog?' for nil:NilClass
    ```

commit f8546ad
Author: IWAI, Masaharu <iwaim.sub@gmail.com>
Date:   Mon Apr 17 22:15:24 2017 +0900

    Update Japanese translation (tootsuite#1993)

    Sync text for toot form

commit 4082e1a
Author: Christophe Gesché <moosh@php.net>
Date:   Mon Apr 17 15:15:14 2017 +0200

    Update fr.jsx "clear" (Nettoyer peut-être ambigu) (tootsuite#1987)

    Un utiliser mal expérimenté pourrait comprendre "retirer les erreurs".
    Ici il s'agit d'une suppression pure et simple, pas une épuration/nettoyage.

    clear would be translated "remove" instead of "cleaning" Cleaning can be unterstood "keep but clean"

commit 6b8e95e
Author: tom <tomfhowe@gmail.com>
Date:   Mon Apr 17 06:27:19 2017 -0400

    Make contents of boost confirmation dialog scroll (tootsuite#1710)

    This is necessary for boosting long posts on small screens - see this post for video: https://slime.global/@masklayer/102308

commit e813810
Author: Brad Urani <bradurani@gmail.com>
Date:   Mon Apr 17 03:26:45 2017 -0700

    Open sidekiq and pghero admin pages in new browser tabs (tootsuite#1596)

    * Open sidekiq and pghero admin pages in new tabs

    * Add missing comma

commit ffb9932
Author: Patrick Figel <patrick@figel.email>
Date:   Mon Apr 17 12:14:03 2017 +0200

    Add gif auto-play/pause preference

    This introduces a new per-user preference called
    "Auto-play animated GIFs", which is enabled by default. When a
    user disables this setting, gifs in toots become click-to-play.

    Previews of animated gifs were changed to display the video play
    button so that users can distinguish them from regular images.

    This setting also affects account avatars in the detailed account
    view, which was changed to use the same hover-to-play mechanism
    that is used for animated avatars in timelines.

    Fixes tootsuite#1652

commit fd62d4d
Author: Ian Kelling <ian@iankelling.org>
Date:   Mon Apr 17 01:42:29 2017 -0700

    Add documentation of SMTP_DOMAIN (tootsuite#1738)

    Without setting it, exim will reject the mail with a message like:
    rejected EHLO from [10.20.0.1]: syntactically invalid argument(s): {}

commit e9eaf9e
Author: Miguel Jacq <mig@mig5.net>
Date:   Mon Apr 17 18:41:19 2017 +1000

    Allow using an SMTP server without authentication (tootsuite#1597)

    * Allow using an SMTP server without authentication (e.g Postfix relay on the same host) by setting SMTP_LOGIN and SMTP_AUTH_METHOD to 'none'

    * Add note in .env.production.sample about SMTP settings for servers where no auth is required

    * Assume that SMTP_LOGIN and SMTP_PASSWORD will be blank if we set SMTP_AUTH_METHOD to none

commit e22f981
Author: happycoloredbanana <happycoloredbanana@users.noreply.github.com>
Date:   Mon Apr 17 11:40:14 2017 +0300

    NFS for shared folder requires a private_network (tootsuite#1263)

commit f3b86c1
Author: Dale Price <daprice@users.noreply.github.com>
Date:   Mon Apr 17 03:39:54 2017 -0500

    Add mask-icon.svg (tootsuite#1572) (tootsuite#1585)

    * Add mask-icon (tootsuite#1572)

    * use updated svg logo for mask-icon

commit 833bfd7
Author: Expenses <expenses@airmail.cc>
Date:   Mon Apr 17 20:38:59 2017 +1200

    Added missing `rake secret` command (tootsuite#1894)

commit 6685106
Author: Hugo Gameiro <hmgameiro@gmail.com>
Date:   Mon Apr 17 09:38:27 2017 +0100

    Add Brazilian Portuguese and fix European Portuguese (tootsuite#1966)

    * update portuguese translation

    added the missing fields and improved the translation

    * pt translations fix

    * improve last translation commit

    * fix damn quotes

    * add pt_br to index.jsx

    * add pt-BR to import index.jsx

    * add pt-BR to mastodon.jsx

    * add pt-BR to settings_helper.rb

    * add pt-BR to application.rb

    * order alphabetically pt.jsx

    * create pt-BR.jsx

    * Create devise.pt-BR.yml

    * language improvements to devise.pt.yml

    * created doorkeeper.pt-BR.yml

    * fixes to doorkeeper.pt.yml

    * create pt-BR.yml

    * improvements to pt.yml

    * Create simple_form.pt-BR.yml

    * Improvements to simple_form.pt.yml

    * improvements to pt.yml

commit 8ad6722
Author: May Kittens Devour Your Soul <yoshimitsu002@gmail.com>
Date:   Mon Apr 17 10:38:13 2017 +0200

    Create hr.jsx (tootsuite#1945)

    * Create hr.jsx

    Start of Croatian translation

    * Update settings_helper.rb

    * Update application.rb

    * Update application.rb

    * Update index.jsx

commit 548ff54
Author: Yuki Nakagawa <yukinari3po@gmail.com>
Date:   Mon Apr 17 17:37:00 2017 +0900

    Optimize user setting page for mobile browser (tootsuite#1924)

    * Remove overflow because it blocks scrolling on mobile safari.

    * Add “-webkit-overflow-scrolling: touch;” to enable smooth scroll on mobile safari and other webkit browsers.

    * Use radio buttons in user setting page.

    Because select tags with long text are not fit in the width of mobile devices.

    * Add flex property to fit labels to devise width.

    * Change font size of select.

    It causes auto zooming on mobile safari.

commit a67909e
Author: Matt Jankowski <mjankowski@thoughtbot.com>
Date:   Mon Apr 17 04:35:42 2017 -0400

    Rubocop instructions (tootsuite#1973)

    * Rubocop link for Sublime Text

    * Fix rubocop links

    * Link to gh issues page from contributing doc

commit 6afe70d
Author: Yamagishi Kazutoshi <ykzts@desire.sh>
Date:   Mon Apr 17 17:35:06 2017 +0900

    Add human locales for zh-tw (tootsuite#1984)

commit b87a08e
Author: usagi-f <usagi.f@gmail.com>
Date:   Mon Apr 17 17:34:33 2017 +0900

    Add function color remaining text (tootsuite#1980)

commit be6cabb
Author: Toshiyuki Takahashi <t.toshi.0412@gmail.com>
Date:   Mon Apr 17 17:32:41 2017 +0900

    Improved Japanese translation in ja.yml (tootsuite#1981)

commit f8ae129
Author: anon <anon@anoncom.net>
Date:   Mon Apr 17 17:32:09 2017 +0900

    Fix tiny typo, and added link to terms and conditions in confirmation email for Japanese. (tootsuite#1975) (tootsuite#1975)

commit 78bdfc4
Author: Ingo Blechschmidt <iblech@web.de>
Date:   Mon Apr 17 10:29:49 2017 +0200

    Fix tiny typo (tootsuite#1956)

commit d87ee11
Author: saturday06 <dyob@lunaport.net>
Date:   Mon Apr 17 17:29:08 2017 +0900

    Assign user locale on signup (tootsuite#1982)

commit 64e1d51
Author: geta6 <getakura@gmail.com>
Date:   Mon Apr 17 11:32:30 2017 +0900

    Improve streaming server with cluster (tootsuite#1970)

commit 7a50867
Author: Keiji, Yoshimi <walf443@gmail.com>
Date:   Mon Apr 17 11:23:13 2017 +0900

    reduce unneed query when post without attachements. (tootsuite#1907)

    * reduce unneed query when post without attachements.

    This commit reduce following query:

    ```
     MediaAttachment Load (0.9ms)  SELECT "media_attachments".* FROM "media_attachments" WHERE "media_attachments"."status
    _id" IS NULL AND 1=0 ORDER BY id asc
    ```

    * fixed for more simple changes.

commit 5e94643
Author: Yamagishi Kazutoshi <ykzts@desire.sh>
Date:   Mon Apr 17 11:22:14 2017 +0900

    Fix minor typo in Japanese translation "保村" -> "保存" (tootsuite#1968)

commit dc6fe4e
Author: Toshiyuki Takahashi <t.toshi.0412@gmail.com>
Date:   Mon Apr 17 11:22:09 2017 +0900

    Improved Japanese translation in devise.ja.yml (tootsuite#1969)

commit acd3310
Merge: fd81916 99226ab
Author: Effy Elden <github@effy.is>
Date:   Mon Apr 17 01:41:33 2017 +1000

    Merge branch 'master' into fix/cache_blocking

commit fd81916
Author: Keiji Yoshimi <walf443@gmail.com>
Date:   Sat Apr 15 23:59:39 2017 +0900

    cache blockings for reducing queries.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment