]>
cat aescling's git repositories - mastodon.git/log
Yamagishi Kazutoshi [Tue, 6 Jun 2017 11:20:07 +0000 (20:20 +0900)]
Improve ESLint rules for JSX (#3608)
* Add react/no-string-refs ESLint rule
* Add react/jsx-boolean-value ESLint rule
* Add react/jsx-closing-bracket-location ESLint rule
* Add react/jsx-indent ESLint rule
* Add react/jsx-curly-spacing ESLint rule
* Add react/jsx-equals-spacing ESLint rule
* Add react/jsx-first-prop-new-line ESLint rule
* Add react/jsx-no-duplicate-props ESLint rule
* Add react/jsx-tag-spacing ESLint rule
Yamagishi Kazutoshi [Tue, 6 Jun 2017 11:19:29 +0000 (20:19 +0900)]
Add missing key attribute to .search-results__hashtag (#3607)
May Kittens Devour Your Soul [Tue, 6 Jun 2017 11:19:05 +0000 (13:19 +0200)]
Update hr.json (#3609)
Yamagishi Kazutoshi [Tue, 6 Jun 2017 02:07:34 +0000 (11:07 +0900)]
Fix typo (storyboard -> storybook) (#3603)
m4sk1n [Tue, 6 Jun 2017 01:59:13 +0000 (03:59 +0200)]
i18n: updated Polish translation (#3597)
* i18n: updated Polish translation
* i18n: updated Polish translation
btw it would be nice to have master-based Mastodon instance (even isolated from others) to test translation.
Yamagishi Kazutoshi [Tue, 6 Jun 2017 01:56:36 +0000 (10:56 +0900)]
Add quotes ESLint rules (#3602)
* Add quotes ESLint rule
* Add jsx-quotes ESlint rule
* Sort ESLint rules
Yamagishi Kazutoshi [Tue, 6 Jun 2017 01:55:56 +0000 (10:55 +0900)]
Disable ESLint rule jsx/anchor-has-content (#3601)
ThibG [Mon, 5 Jun 2017 22:09:14 +0000 (00:09 +0200)]
Try fixing ThreadResolveWorker calls (#3599)
* Try fixing ThreadResolveWorker calls
From my understanding of ActiveRecord, a transaction is commited as soon as
the exit of the outmost ActiveRecord.transaction block. However, inner
transaction blocks will exit without the transaction being commited.
In this case, ThreadResolveWorker were fired *within* a transaction block,
so moving the call out of it should do the trick. However, this is somewhat
fragile, as this whole codepath could be called within yet another transaction.
* Set status thread within the transaction block if it is immediately available from database
Naoki Kosaka [Mon, 5 Jun 2017 17:18:26 +0000 (02:18 +0900)]
Fix LoadMore in Notifications. (#3590)
Naoki Kosaka [Mon, 5 Jun 2017 16:18:56 +0000 (01:18 +0900)]
Fix (PR #3585) Add hasMore to propTypes and cover handleScroll. (#3589)
unarist [Mon, 5 Jun 2017 15:10:40 +0000 (00:10 +0900)]
Add back button to hashtag timeline again (#3587)
Shunsuke Michii [Mon, 5 Jun 2017 15:02:41 +0000 (00:02 +0900)]
Add th.json. (#3588)
IkUrA [Mon, 5 Jun 2017 14:37:44 +0000 (23:37 +0900)]
Add streaming_api_base_url to /api/v1/instance (#3556)
* Add streaming_api_base_url to /api/v1/instance
* Adjust spaces
* nested view
* re-adjust spaces
Matt Jankowski [Mon, 5 Jun 2017 14:07:44 +0000 (10:07 -0400)]
Introduce StatusThreadingConcern (#3490)
* Add a StatusFilter class to identify visibility of statuses by accounts
* Extract StatusThreadingConcern from Status
* Clarify purpose of checking for nil account
unarist [Mon, 5 Jun 2017 13:20:46 +0000 (22:20 +0900)]
Prevent pinned columns from scroll to top on URL changing (#3586)
Naoki Kosaka [Mon, 5 Jun 2017 12:13:20 +0000 (21:13 +0900)]
Fix LoadMore in following and followers. (#3585)
Eugen Rochko [Mon, 5 Jun 2017 11:24:00 +0000 (13:24 +0200)]
Fix #3550 - Add all missing foreign keys (#3562)
* Fix #3550 - Add all missing foreign keys
* Add missing foreign keys
Daigo 3 Dango [Mon, 5 Jun 2017 10:09:29 +0000 (10:09 +0000)]
Redirect to streaming_api_base_url (#3579)
* Redirect to streaming_api_base_url
When Rails receives a request to streaming API, it most likely
means that there is another host which is configured to respond
to it. This is to redirect clients to that host if
`STREAMING_API_BASE_URL` is set as another host.
* Use the new Ruby 1.9 hash syntax
Yamagishi Kazutoshi [Mon, 5 Jun 2017 08:09:14 +0000 (17:09 +0900)]
Add support key shortcut to Onboarding Modal (#3517)
* Add support key shortcut to Onboarding Modal
* this.state.pages -> this.pages
Yamagishi Kazutoshi [Mon, 5 Jun 2017 08:08:31 +0000 (17:08 +0900)]
Fix broken embed page (#3577)
Yamagishi Kazutoshi [Mon, 5 Jun 2017 08:08:07 +0000 (17:08 +0900)]
Add OnboadingModal story (#3578)
Yamagishi Kazutoshi [Mon, 5 Jun 2017 08:03:36 +0000 (17:03 +0900)]
Fix randomly fail (regression from #3560) (#3580)
Yamagishi Kazutoshi [Mon, 5 Jun 2017 08:03:01 +0000 (17:03 +0900)]
Skip image length check (regression from #3528) (#3581)
René Klačan [Mon, 5 Jun 2017 01:24:18 +0000 (03:24 +0200)]
Don't follow account if it's already followed (#3575)
Closes https://github.com/tootsuite/mastodon/issues/3102
René Klačan [Mon, 5 Jun 2017 00:43:02 +0000 (02:43 +0200)]
Add migration versions (#3574)
Since Rails 5.1 missing migration version results in following error:
```
StandardError: Directly inheriting from ActiveRecord::Migration is not supported. Please specify the Rails release the migration was written for:
```
This PR fixes all migration files.
Quent-in [Sun, 4 Jun 2017 23:31:10 +0000 (01:31 +0200)]
l10n update for occitan language (#3557)
* i18n Update : Add preference setting for delete toot modal
Adding a line for "Add preference setting for delete toot modal"
* i18n update for pin/unpin
Update to add two more translations
* i18n update to have the dates in plain occitan
* Removed the blank line
* %{selft} back in the translation
Matt Jankowski [Sun, 4 Jun 2017 23:10:13 +0000 (19:10 -0400)]
Gem version bumps (#3524)
* Update annotate to version 2.7.2
* Update puma to version 3.9.0
* Update aws-sdk to version 2.9.28
* Update bootsnap to version 1.0.0
* Update nio4r to version 2.1.0
* Update nokogumbo to version 1.4.12
* Update oj to version 3.0.11
* Update pkg-config to version 1.2.3
* Update rubocop to version 0.49.1
* Update sidekiq-scheduler to version 2.1.5
Eugen Rochko [Sun, 4 Jun 2017 23:03:45 +0000 (01:03 +0200)]
Added support for configurable reserved usernames (fix of #1382) (#3566)
* Added support for configurable reserved usernames
* Added reserved usernames from mastodon issue 1355
* Fix reserved usernames
Yamagishi Kazutoshi [Sun, 4 Jun 2017 23:02:19 +0000 (08:02 +0900)]
Add date to ignore_missing and ignore_unused in config/i18n-tasks.yml (#3572)
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 4 Jun 2017 15:13:37 +0000 (00:13 +0900)]
Cover WebfingerResource more (#3560)
Yamagishi Kazutoshi [Sun, 4 Jun 2017 15:13:21 +0000 (00:13 +0900)]
Update dependencies of Node.js (#3561)
* Update axios to version 0.16.2
* Update css-loader to version 0.28.4
* Update postcss-smart-import to version 0.7.4
* Update react-immutable-pure-component to version 0.0.5
* Update stringz to version 0.2.1
* Update style-loader to version 0.18.1
* Update websocket.js to version 0.1.9
* yarn upgrade
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 4 Jun 2017 15:07:39 +0000 (00:07 +0900)]
Spec ScopedSettings (#3559)
Yamagishi Kazutoshi [Sun, 4 Jun 2017 14:26:07 +0000 (23:26 +0900)]
Upgrade storybook to v3 (#3558)
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 4 Jun 2017 14:14:25 +0000 (23:14 +0900)]
Remove some code in TagManager and spec (#3547)
* Do not fall back to StreamEntry if object_type is unavailable in TagManager
Since
6d6a429af8fe4bd92ed497f401676353fdc603e0 , when Status, the only model
with stream_entry, and StreamEntry got its own logic in uri_for and
url_for, the purpose of the fallbacks to activity_type of StreamEntry
became unclear.
This commit removes the fallbacks. When adding another model with
stream_entry in future, consider to update uri_for and url_for.
* Cover TagManager more
m4sk1n [Sun, 4 Jun 2017 13:18:42 +0000 (15:18 +0200)]
i18n: Updated Polish translation (#3555)
lindwurm [Sun, 4 Jun 2017 13:00:15 +0000 (22:00 +0900)]
l10n: ja: Change about/more link text (#3539)
ref: #3538 ("Extended information" -> "About this instance") and #3519
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 4 Jun 2017 13:00:08 +0000 (22:00 +0900)]
Spec InlineRablScope (#3542)
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 4 Jun 2017 12:59:52 +0000 (21:59 +0900)]
Spec HashObject (#3544)
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 4 Jun 2017 12:59:40 +0000 (21:59 +0900)]
A minor change for ProviderDiscovery and spec (#3543)
* Do not default the format in ProviderDiscovery
The format should be determined when discovering, as it is in the current
implementation, and it is a flaw if it is not determined.
* Spec ProviderDiscovery
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 4 Jun 2017 12:58:57 +0000 (21:58 +0900)]
Remove some arguments of Formatter.instance.format and spec (#3541)
* Remove some arguments of Formatter.instance.format
* Improve spec for Formatter
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 4 Jun 2017 12:57:02 +0000 (21:57 +0900)]
Spec Extractor (#3540)
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 4 Jun 2017 12:56:31 +0000 (21:56 +0900)]
Spec action verification of StreamEntryFinder (#3549)
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 4 Jun 2017 12:56:10 +0000 (21:56 +0900)]
Remove Targetable (#3548)
Naoki Kosaka [Sun, 4 Jun 2017 12:52:26 +0000 (21:52 +0900)]
Fix limit_param in favourites_controller.rb (#3553)
Yamagishi Kazutoshi [Sun, 4 Jun 2017 12:52:02 +0000 (21:52 +0900)]
Fix column buttons overflow in Japanese (#3552)
Yamagishi Kazutoshi [Sun, 4 Jun 2017 12:51:35 +0000 (21:51 +0900)]
Add Japanese translations (pin) (#3551)
* Add Japanese translations (pin)
* "ピン留め" is more general
unarist [Sun, 4 Jun 2017 12:51:06 +0000 (21:51 +0900)]
Fix all icons in the column header being hilighted (#3554)
Mingye Wang [Sun, 4 Jun 2017 02:25:18 +0000 (22:25 -0400)]
en.json: change about/more link text to "About this instance" (#3538)
This change follows #3519, which does the same for the Chinese variants. Or should it be simply "About"?
Eugen Rochko [Sat, 3 Jun 2017 23:39:38 +0000 (01:39 +0200)]
Allow mounting arbitrary columns (#3207)
* Allow mounting arbitrary columns
* Refactor column headers, allow pinning/unpinning and moving columns around
* Collapse animation
* Re-introduce scroll to top
* Save column settings properly, do not display pin options in
single-column view, do not display collapse icon if there is
nothing to collapse
* Fix one instance of public timeline being closed closing the stream
Fix back buttons inconsistently sending you back to / even if history exists
* Getting started displays links to columns that are not mounted
masarakki [Sat, 3 Jun 2017 23:22:37 +0000 (08:22 +0900)]
refocus-after-toot (#3537)
takayamaki [Sat, 3 Jun 2017 22:11:15 +0000 (07:11 +0900)]
change sidekiq queueing to bulk push (#3536)
Akihiko Odaki (@fn_aki@pawoo.net) [Sat, 3 Jun 2017 18:51:08 +0000 (03:51 +0900)]
Remove redundant code in AtomSerializer and spec (#3528)
* Remove redundant status.reply? in AtomSerializer#object
* Cover AtomSerializer more
Clworld [Sat, 3 Jun 2017 18:50:53 +0000 (03:50 +0900)]
Execute PushUpdateWorker only for accounts who uses StreamingAPI just now. (#3278)
* Add redis key "subscribed:timeline:#{account.id}" to indicate active streaming API listeners exists.
* Add endpoint for notification only stream.
* Run PushUpdateWorker only for users uses Streaming API now.
* Move close hander streamTo(Http/Ws) -> stream(Http/Ws)End (Deal with #3370)
* Add stream type for stream start log message.
Yamagishi Kazutoshi [Sat, 3 Jun 2017 13:13:12 +0000 (22:13 +0900)]
Cache assets in travis (#3532)
Nolan Lawson [Sat, 3 Jun 2017 12:43:10 +0000 (05:43 -0700)]
Fix isIntersecting in Chrome (#3525)
Mingye Wang [Sat, 3 Jun 2017 12:42:47 +0000 (08:42 -0400)]
zh-cn&tw.json: "extended info" -> "about this site" (#3519)
* zh-cn.json: "additional info" -> "more info"
This commit changes the "extended info" (about/more) text to something that translates to "more info", as "additional info" in zh can sound like appending things to the (ugh) navbar, I guess.
Or should I just change it to "about this site" (关于本站)?
* zh-cn.json: navbar.info -> "about this site"
* zh-臺灣.json: navbar.info -> "about this site"
Yamagishi Kazutoshi [Sat, 3 Jun 2017 12:40:55 +0000 (21:40 +0900)]
Fix spec for #2388 (#3526)
Yamagishi Kazutoshi [Sat, 3 Jun 2017 12:40:47 +0000 (21:40 +0900)]
Remove WarmCacheService (#3527)
WarmCacheService is no longer used (removed with
5442083b3c44c731679fc489568bf7f70a807a39 ).
Yamagishi Kazutoshi [Sat, 3 Jun 2017 12:40:24 +0000 (21:40 +0900)]
Change toggle state when click label (#3530)
ThibG [Fri, 2 Jun 2017 20:21:36 +0000 (22:21 +0200)]
Ensure well_known controllers use WEB_DOMAIN by including RoutingHelper (#2388)
This fixes #2375.
Clworld [Fri, 2 Jun 2017 18:11:13 +0000 (03:11 +0900)]
bump rails version in Gemfile: '~> 5.0.0' -> '~> 5.1.0' (#3523)
Naoki Kosaka [Fri, 2 Jun 2017 16:09:28 +0000 (01:09 +0900)]
Ignore packs folder when COPY . /mastodon (#3522)
Sorin Davidoi [Fri, 2 Jun 2017 14:19:11 +0000 (16:19 +0200)]
Ignore .idea folder (#3516)
Used by Intellij IDEA / WebStorm / RubyMine.
Matt Jankowski [Fri, 2 Jun 2017 14:18:54 +0000 (10:18 -0400)]
Add index to media_attachments.account_id (#3510)
Nolan Lawson [Fri, 2 Jun 2017 01:49:56 +0000 (18:49 -0700)]
Enable stats.json analysis with Webpack Visualizer (#3509)
Akihiko Odaki (@fn_aki@pawoo.net) [Thu, 1 Jun 2017 18:56:55 +0000 (03:56 +0900)]
Spec response for forgery (#3248)
Remove protect_from_forgery in ApiController, which is disabled by the
following skip_before_action, as well.
Akihiko Odaki (@fn_aki@pawoo.net) [Thu, 1 Jun 2017 18:56:32 +0000 (03:56 +0900)]
Resolve custom application stylesheet with Webpack (#3373)
This implementation is a bit smaller and still has the following benefits:
* No need of app/javascript/packs/custom.js
For custom stylesheet, it typically has only
"require('../styles/custom.scss')" and is redundant.
* No need to extract vendor stylesheet to another asset
Extracting vendor stylesheet could be forgotten by developers who do not
use custom stylesheet.
Matt Jankowski [Thu, 1 Jun 2017 18:53:37 +0000 (14:53 -0400)]
Update Rails to version 5.1.1 (#3121)
* Update rails to version 5.1.1
* Run `rails app:update`
* Remove the override of polymorphic activity relationship
* Silence warning about otp_secret attribute being unknown to rails
* We will only introduce form_with where we want to use remote data
Daniel Hunsaker [Thu, 1 Jun 2017 15:33:57 +0000 (09:33 -0600)]
[nanobox] Add python for node-gyp (#3491)
Needed since merge of #3067.
Yamagishi Kazutoshi [Thu, 1 Jun 2017 15:27:35 +0000 (00:27 +0900)]
Remove unused loaders of webpack (#3495)
Yamagishi Kazutoshi [Thu, 1 Jun 2017 15:27:15 +0000 (00:27 +0900)]
Improve tests for JavaScript (#3496)
- Upgrade dependencies
- chai (3.5.0 -> 4.0.1)
- chai-enzyme (0.6.1 -> 0.7.1)
- sinon (2.2.0 -> 2.3.2)
- Change extensions from .jsx to .js
- Don't assign `React` to `global`
- Check code format using ESLint
Yamagishi Kazutoshi [Thu, 1 Jun 2017 15:25:59 +0000 (00:25 +0900)]
Add scenarios for log in (#3497)
Yamagishi Kazutoshi [Thu, 1 Jun 2017 15:25:10 +0000 (00:25 +0900)]
Add ESLint rule (object-curly-spacing) (#3498)
Matt Jankowski [Thu, 1 Jun 2017 15:24:30 +0000 (11:24 -0400)]
Rubocop changes (#3501)
* Update renamed rubocop configuration options
* Remove duplicate rubocop configuration, sort options
Matt Jankowski [Thu, 1 Jun 2017 13:29:14 +0000 (09:29 -0400)]
Remove usernames and hashtags from language detection (#3503)
* Add failing specs for hashtag and username extraction in language detector
* Remove usernames and hashtags from text before language detection
* Handle multiple instances of special case, and reduce whitespace
Matt Jankowski [Thu, 1 Jun 2017 12:20:36 +0000 (08:20 -0400)]
Handle nil and blank cases in Account finders (#3500)
unarist [Thu, 1 Jun 2017 02:20:10 +0000 (11:20 +0900)]
Focus the submit button on the boost modal (#3494)
Focus the submit button when boost modal is opened.
Matt Jankowski [Wed, 31 May 2017 19:36:24 +0000 (15:36 -0400)]
Spec coverage and refactor for the api/v1/accounts controllers (#3451)
Matt Jankowski [Wed, 31 May 2017 18:39:35 +0000 (14:39 -0400)]
Move admin/pubsubhubbub controller to admin/subscriptions (#3442)
Matt Jankowski [Wed, 31 May 2017 18:38:44 +0000 (14:38 -0400)]
Add Instance class to list admin records (#3443)
Matt Jankowski [Wed, 31 May 2017 18:38:17 +0000 (14:38 -0400)]
Misc tidying and clean ups (#3445)
* Remove trailing whitespace in i18n mailers
* Use query methods instead of #present? on AR attributes
* Delegate Status#account_domain method
* Delegate Mention #account_username and #account_acct methods
Matt Jankowski [Wed, 31 May 2017 18:34:51 +0000 (14:34 -0400)]
Improve spec coverage and clean up api/v1/blocks controller (#3464)
Matt Jankowski [Wed, 31 May 2017 18:32:11 +0000 (14:32 -0400)]
Improve spec coverage and clean up api/v1/follow_requests controller (#3465)
Matt Jankowski [Wed, 31 May 2017 18:31:14 +0000 (14:31 -0400)]
Improve spec coverage and clean up api/v1/domain_blocks controller (#3466)
Matt Jankowski [Wed, 31 May 2017 18:30:55 +0000 (14:30 -0400)]
Refactor api/v1/notifications controller (#3470)
Matt Jankowski [Wed, 31 May 2017 18:30:39 +0000 (14:30 -0400)]
Improve spec coverage and clean up api/v1/favourites controller (#3472)
Matt Jankowski [Wed, 31 May 2017 18:28:45 +0000 (14:28 -0400)]
Expand spec coverage and refactor the `Account.find_` methods (#3485)
* Move specs for account finder methods to concern spec
* Move account finder methods to concern
* Improve spec wording
* Use more explicit comparison to ensure correct return value
* Add coverage for .find_local! and .find_remote!
* Add some methods to the finder
* Use arel on matching_username method
* Avoid ternary in matching domain method
* Simplify finder methods
* Use an AccountFinder class to simplify lookup
Matt Jankowski [Wed, 31 May 2017 18:27:34 +0000 (14:27 -0400)]
Improve spec coverage and clean up api/v1/mutes controller (#3481)
Matt Jankowski [Wed, 31 May 2017 18:27:17 +0000 (14:27 -0400)]
Refactor and spec coverage for api/v1/timelines actions (#3482)
caasi Huang [Wed, 31 May 2017 16:46:57 +0000 (00:46 +0800)]
Update zh-TW.json (#3480)
* Update zh-TW.json
* Update `search_results.total`
Yamagishi Kazutoshi [Wed, 31 May 2017 15:09:28 +0000 (00:09 +0900)]
Hold value of I18n.locale with ApplicationHelperSpec (#3474)
Yamagishi Kazutoshi [Wed, 31 May 2017 15:09:17 +0000 (00:09 +0900)]
Keep ENV['LOCAL_HTTPS'] with ApplicationControllerSpec (fix random fail) (#3479)
* Keep ENV['LOCAL_HTTPS'] with ApplicationControllerSpec (fix random fail)
* use climate_control
Nolan Lawson [Wed, 31 May 2017 15:07:25 +0000 (08:07 -0700)]
Remove react-imageloader (#3423)
* Remove react-imageloader
* add eslint-disable-line
* improve image loading experience
* remove unneeded import
* use PureComponent
* Use componentWillMount instead of constructor
unarist [Wed, 31 May 2017 13:30:26 +0000 (22:30 +0900)]
Fix load more on account timelines (regression from #3311) (#3475)
This prevents `next` state from being overridden on the loading *new* statuses.
Nolan Lawson [Wed, 31 May 2017 13:11:33 +0000 (06:11 -0700)]
Improve scheduling of requestIdleCallback tasks (#3477)
alpaca-tc [Wed, 31 May 2017 13:10:26 +0000 (22:10 +0900)]
Account.find_remote should be raise ActiveRecord::RecordNotFound (#3476)
Matt Jankowski [Wed, 31 May 2017 01:16:28 +0000 (21:16 -0400)]
Refactor api/v1/apps controller (#3471)
Matt Jankowski [Wed, 31 May 2017 01:13:31 +0000 (21:13 -0400)]
Refactor api/v1/reports controller (#3469)
Matt Jankowski [Wed, 31 May 2017 01:11:54 +0000 (21:11 -0400)]
Refactor api/v1/search controller (#3468)
Matt Jankowski [Wed, 31 May 2017 01:11:29 +0000 (21:11 -0400)]
Improve spec coverage and clean up api/v1/media controller (#3467)