about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-06-05Add migration versions (#3574)René Klačan
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.
2017-06-05l10n update for occitan language (#3557)Quent-in
* 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
2017-06-05Gem version bumps (#3524)Matt Jankowski
* 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
2017-06-05Added support for configurable reserved usernames (fix of #1382) (#3566)Eugen Rochko
* Added support for configurable reserved usernames * Added reserved usernames from mastodon issue 1355 * Fix reserved usernames
2017-06-05Add date to ignore_missing and ignore_unused in config/i18n-tasks.yml (#3572)Yamagishi Kazutoshi
2017-06-04Cover WebfingerResource more (#3560)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-04Update dependencies of Node.js (#3561)Yamagishi Kazutoshi
* 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
2017-06-04Spec ScopedSettings (#3559)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-04Upgrade storybook to v3 (#3558)Yamagishi Kazutoshi
2017-06-04Remove some code in TagManager and spec (#3547)Akihiko Odaki (@fn_aki@pawoo.net)
* 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
2017-06-04i18n: Updated Polish translation (#3555)m4sk1n
2017-06-04l10n: ja: Change about/more link text (#3539)lindwurm
ref: #3538 ("Extended information" -> "About this instance") and #3519 Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-06-04Spec InlineRablScope (#3542)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-04Spec HashObject (#3544)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-04A minor change for ProviderDiscovery and spec (#3543)Akihiko Odaki (@fn_aki@pawoo.net)
* 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
2017-06-04Remove some arguments of Formatter.instance.format and spec (#3541)Akihiko Odaki (@fn_aki@pawoo.net)
* Remove some arguments of Formatter.instance.format * Improve spec for Formatter
2017-06-04Spec Extractor (#3540)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-04Spec action verification of StreamEntryFinder (#3549)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-04Remove Targetable (#3548)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-04Fix limit_param in favourites_controller.rb (#3553)Naoki Kosaka
2017-06-04Fix column buttons overflow in Japanese (#3552)Yamagishi Kazutoshi
2017-06-04Add Japanese translations (pin) (#3551)Yamagishi Kazutoshi
* Add Japanese translations (pin) * "ピン留め" is more general
2017-06-04Fix all icons in the column header being hilighted (#3554)unarist
2017-06-04en.json: change about/more link text to "About this instance" (#3538)Mingye Wang
This change follows #3519, which does the same for the Chinese variants. Or should it be simply "About"?
2017-06-04Allow mounting arbitrary columns (#3207)Eugen Rochko
* 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
2017-06-04refocus-after-toot (#3537)masarakki
2017-06-04change sidekiq queueing to bulk push (#3536)takayamaki
2017-06-03Remove redundant code in AtomSerializer and spec (#3528)Akihiko Odaki (@fn_aki@pawoo.net)
* Remove redundant status.reply? in AtomSerializer#object * Cover AtomSerializer more
2017-06-03Execute PushUpdateWorker only for accounts who uses StreamingAPI just now. ↵Clworld
(#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.
2017-06-03Cache assets in travis (#3532)Yamagishi Kazutoshi
2017-06-03Fix isIntersecting in Chrome (#3525)Nolan Lawson
2017-06-03zh-cn&tw.json: "extended info" -> "about this site" (#3519)Mingye Wang
* 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"
2017-06-03Fix spec for #2388 (#3526)Yamagishi Kazutoshi
2017-06-03Remove WarmCacheService (#3527)Yamagishi Kazutoshi
WarmCacheService is no longer used (removed with 5442083b3c44c731679fc489568bf7f70a807a39 ).
2017-06-03Change toggle state when click label (#3530)Yamagishi Kazutoshi
2017-06-02Ensure well_known controllers use WEB_DOMAIN by including RoutingHelper (#2388)ThibG
This fixes #2375.
2017-06-02bump rails version in Gemfile: '~> 5.0.0' -> '~> 5.1.0' (#3523)Clworld
2017-06-02Ignore packs folder when COPY . /mastodon (#3522)Naoki Kosaka
2017-06-02Ignore .idea folder (#3516)Sorin Davidoi
Used by Intellij IDEA / WebStorm / RubyMine.
2017-06-02Add index to media_attachments.account_id (#3510)Matt Jankowski
2017-06-02Enable stats.json analysis with Webpack Visualizer (#3509)Nolan Lawson
2017-06-01Spec response for forgery (#3248)Akihiko Odaki (@fn_aki@pawoo.net)
Remove protect_from_forgery in ApiController, which is disabled by the following skip_before_action, as well.
2017-06-01Resolve custom application stylesheet with Webpack (#3373)Akihiko Odaki (@fn_aki@pawoo.net)
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.
2017-06-01Update Rails to version 5.1.1 (#3121)Matt Jankowski
* 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
2017-06-01[nanobox] Add python for node-gyp (#3491)Daniel Hunsaker
Needed since merge of #3067.
2017-06-01Remove unused loaders of webpack (#3495)Yamagishi Kazutoshi
2017-06-01Improve tests for JavaScript (#3496)Yamagishi Kazutoshi
- 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
2017-06-01Add scenarios for log in (#3497)Yamagishi Kazutoshi
2017-06-01Add ESLint rule (object-curly-spacing) (#3498)Yamagishi Kazutoshi
2017-06-01Rubocop changes (#3501)Matt Jankowski
* Update renamed rubocop configuration options * Remove duplicate rubocop configuration, sort options