about summary refs log tree commit diff
AgeCommit message (Collapse)Author
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
2017-06-01Remove usernames and hashtags from language detection (#3503)Matt Jankowski
* 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
2017-06-01Handle nil and blank cases in Account finders (#3500)Matt Jankowski
2017-06-01Focus the submit button on the boost modal (#3494)unarist
Focus the submit button when boost modal is opened.
2017-05-31Spec coverage and refactor for the api/v1/accounts controllers (#3451)Matt Jankowski
2017-05-31Move admin/pubsubhubbub controller to admin/subscriptions (#3442)Matt Jankowski
2017-05-31Add Instance class to list admin records (#3443)Matt Jankowski
2017-05-31Misc tidying and clean ups (#3445)Matt Jankowski
* 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
2017-05-31Improve spec coverage and clean up api/v1/blocks controller (#3464)Matt Jankowski
2017-05-31Improve spec coverage and clean up api/v1/follow_requests controller (#3465)Matt Jankowski
2017-05-31Improve spec coverage and clean up api/v1/domain_blocks controller (#3466)Matt Jankowski
2017-05-31Refactor api/v1/notifications controller (#3470)Matt Jankowski
2017-05-31Improve spec coverage and clean up api/v1/favourites controller (#3472)Matt Jankowski
2017-05-31Expand spec coverage and refactor the `Account.find_` methods (#3485)Matt Jankowski
* 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
2017-05-31Improve spec coverage and clean up api/v1/mutes controller (#3481)Matt Jankowski
2017-05-31Refactor and spec coverage for api/v1/timelines actions (#3482)Matt Jankowski
2017-05-31Update zh-TW.json (#3480)caasi Huang
* Update zh-TW.json * Update `search_results.total`
2017-05-31Hold value of I18n.locale with ApplicationHelperSpec (#3474)Yamagishi Kazutoshi
2017-05-31Keep ENV['LOCAL_HTTPS'] with ApplicationControllerSpec (fix random fail) (#3479)Yamagishi Kazutoshi
* Keep ENV['LOCAL_HTTPS'] with ApplicationControllerSpec (fix random fail) * use climate_control
2017-05-31Remove react-imageloader (#3423)Nolan Lawson
* Remove react-imageloader * add eslint-disable-line * improve image loading experience * remove unneeded import * use PureComponent * Use componentWillMount instead of constructor
2017-05-31Fix load more on account timelines (regression from #3311) (#3475)unarist
This prevents `next` state from being overridden on the loading *new* statuses.
2017-05-31Improve scheduling of requestIdleCallback tasks (#3477)Nolan Lawson
2017-05-31Account.find_remote should be raise ActiveRecord::RecordNotFound (#3476)alpaca-tc
2017-05-30Refactor api/v1/apps controller (#3471)Matt Jankowski
2017-05-30Refactor api/v1/reports controller (#3469)Matt Jankowski
2017-05-30Refactor api/v1/search controller (#3468)Matt Jankowski
2017-05-30Improve spec coverage and clean up api/v1/media controller (#3467)Matt Jankowski
2017-05-31Clean up api/subscriptions controller (#3448)Matt Jankowski
2017-05-31Catalan language updates (#3454)spla
* Add Catalan language * Add Catalan language * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update settings_helper.rb * Update mastodon.js * Update index.js * Update application.rb * Update ca.yml * removed extra spaces at line 225 * Catalan translation update added activerecord.ca.yml * Update activerecord.ca.yml Done * Updated activerecord.ca.yml * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated
2017-05-31Change PureComponent to ImmutablePureComponent (#3460)Yamagishi Kazutoshi
* Change PureComponent to ImmutablePureComponent Change PureComponent to ImmutablePureComponent in AttachmentList. * rm React.
2017-05-30Add zh-TW.json (#3459)Yamagishi Kazutoshi
2017-05-30Add status destroy authorization to policy (#3453)Jack Jennings
* Add status destroy authorization to policy * Create explicit unreblog status authorization
2017-05-30Improve api oembed controller (#3450)Matt Jankowski
* Add StreamEntryFinder class to parse URLs * Use StreamEntryFinder and clean up api/oembed controller
2017-05-30Clean up api/salmon controller (#3449)Matt Jankowski
2017-05-30Fix incorrect visibility setter in StatusPolicySpec (#3456)Jack Jennings
2017-05-30Remove exports/base controller in favor of shared concern (#3444)Matt Jankowski
2017-05-30added 'https://' to CDN_HOST variable example (#3446)Chris