about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-05-30Use around hook to restore context in InstancePresenter spec (#3430)Akihiko Odaki
2017-05-30Use around hook to restore context in InstanceHelper spec (#3429)Akihiko Odaki
2017-05-30Use around hook to restore context in Admin::SettingsController spec (#3428)Akihiko Odaki
2017-05-30Use around hook to restore context in ApplicationHelper spec (#3432)Akihiko Odaki
2017-05-30Run bundle command (follow up #3403) (#3427)Yamagishi Kazutoshi
2017-05-29Update dependencies of Node.js (#3067)Yamagishi Kazutoshi
* Update autoprefixer to version 7.1.0 * Update axios to version 0.16.1 * Update babel-cli to version 6.24.1 * Update babel-eslint to version 7.2.3 * Update babel-preset-react to version 6.24.1 * Update coffee-script to version 1.12.6 * Update css-loader to version 0.28.1 * Update express to version 4.15.2 * Update js-yaml to version 3.8.4 * Update mocha to version 3.4.1 * Update jsdom to version 10.1.0 * Update npmlog to version 4.1.0 * Update postcss-smart-import to version 0.7.0 * Update postcss-loader to version 2.0.5 * Update pg to version 6.1.5 * Update prop-types to version 15.5.10 * Update rails-ujs to version 5.1.1 * Update redis to version 2.7.1 * Update sass-loader to version 6.0.5 * Update stringz to version 0.2.0 * Update webpack to version 2.5.1 * Update style-loader to version 0.17.0 * Update sinon to version 2.2.0 * Update react-motion to version 0.5.0 * Update react-notification to version 6.7.0 * Update react-redux-loading-bar to version 2.9.0 * Update react-intl to version 2.3.0 * Update redux-immutable to version 4.0.0 * Update reselect to version 3.0.1 * Update react-toggle to version 3.0.1 * Update react-simple-dropdown to version 3.0.0 * Update react-router to version 3.0.5 * Update react-router-scroll to version 0.4.2 * Update react-toggle to version 4.0.1 * yarn upgrade
2017-05-29Extract authorization policy for viewing statuses (#3150)Jack Jennings
2017-05-29[RFC] Return 401 for an authentication error on WebSockets (#3411)unarist
* Return 401 for an authentication error on WebSocket * Use upgradeReq instead of a custom object
2017-05-29Version bumps for non-rails gems (#3398)Matt Jankowski
* Update xpath to version 2.1.0 * Update aws-sdk to version 2.9.25 * Update oj to version 3.0.10 * Update brakeman to version 3.6.2 * Update rufus-scheduler to version 3.4.2 * Update doorkeeper to version 4.2.6 * Update rubocop to version 0.49.0
2017-05-29Add IntersectionObserverWrapper to cut down on re-renders (#3406)Nolan Lawson
2017-05-29Remove methods from ObfuscateFilename and spec (#3347)Akihiko Odaki
* Remove methods from ObfuscateFilename * Spec ObfuscateFilename
2017-05-29Spec Auth::ConfirmationsController (#3348)Akihiko Odaki
2017-05-29Spec AccountControllerConcern (#3349)Akihiko Odaki
2017-05-29Cover Admin::ReportsController more (#3346)Akihiko Odaki
2017-05-29Cover InstancesController more (#3342)Akihiko Odaki
2017-05-29Cover Admin::SuspensionsController more (#3350)Akihiko Odaki
2017-05-29Spec Auth::PasswordsController (#3352)Akihiko Odaki
2017-05-29Spec Admin::ResetsController calls send_reset_password_instructions (#3354)Akihiko Odaki
2017-05-29Spec #destroy feature of Admin::TwoFactorAuthenticationsController (#3355)Akihiko Odaki
2017-05-29Coever Admin::SilencesController more (#3356)Akihiko Odaki
2017-05-29Cover Settings::ExportsController more (#3358)Akihiko Odaki
2017-05-29Cover Oauth::AuthorizedApplicationsController (#3359)Akihiko Odaki
2017-05-29Cover Oauth::AuthorizationsController more (#3361)Akihiko Odaki
2017-05-29Cover Settings::TwoFactorAuthenticationsController more (#3376)Akihiko Odaki
2017-05-29Cover WellKnown::HostMetaController more (#3382)Akihiko Odaki
2017-05-29Cover Settings::TwoFactorAuthentication::RecoveryCodesController more (#3383)Akihiko Odaki
2017-05-29Spec Settings::Exports (#3384)Akihiko Odaki
* Spec output of Settings::Exports::BlockedAccountsController * Spec output of Settings::Exports::FollowingAccountsController * Spec output of Settings::Exports::MutedAccountsController * Spec Settings::Exports::BaseController This commit removes duplicate specs in classes inheriting Settings::Exports::BaseController as well.
2017-05-29Cover WellKnown::WebfingerController more (#3385)Akihiko Odaki
2017-05-29Cover Settings::TwoFactorAuthentication::ConfirmationsController more (#3386)Akihiko Odaki
2017-05-29Cover ApplicationHelper more (#3412)Akihiko Odaki
2017-05-29Spec Activitystreams2BuilderHelper (#3413)Akihiko Odaki
2017-05-29Spec FlashesHelper (#3414)Akihiko Odaki
2017-05-29Spec HomeHelper (#3415)Akihiko Odaki
2017-05-29Spec HttpHelper (#3416)Akihiko Odaki
2017-05-29Cover Admin::PubSubHubHubController more (#3343)Akihiko Odaki
2017-05-29Don't stream toots from users who have blocked the recipient user (#3300)unarist
* Don't stream toots from users who have blocked the recipient user This filter was already applied on the `/api/v1/timelines/public` API, but not yet for the Streaming API. * Boosted status' account_id doesn't need for filtering in streaming/index.js This filtering is only for public/hashtag timelines, but boosts already filtered on FanOutOnWriteService because those timelines don't show boosts.
2017-05-29[nanobox] Adjustments for Nanobox development (#3295)Daniel Hunsaker
Because Nanobox doesn't run data components in the same container as the code, there are a few tweaks that need to be made in the configuration to get WebPack to work properly in development mode. The same differences lead to needing to use `DATABASE_URL` by default in the `.env` file for Rails to work correctly. Limitations of our `.env` loader for Node.js mean the `.env` file needs to be compiled everywhere in order to work, so we compile it in development, now, too. Also, all the `.env.production` tweaks have been consolidated into a single command. Finally, since Nanobox actually creates the database when it sets up the database server, using the existence of the database alone to determine whether to migrate or setup is insufficient. So we add a condition to `rake db:migrate:setup` to check whether any migrations have run - if the database doesn't exist yet, `db:setup` will be called; if it does, but no migrations have been run, `db:migrate` and `db:seed` are called instead (the same basic idea as what `db:setup` does, but it skips `db:create`, which will only cause problems with an existing DB); otherwise, only `db:migrate` is called. None of these changes should affect development, and all are designed not to interfere with existing behaviors in other environments.
2017-05-29Add preference setting for delete toot modal (#3368)Atsushi Yamamoto
* Set delete_modal preference to true by default * Does not show confirmation modal if delete_modal is false * Add ja translation for preference setting page
2017-05-29Prevent wasted render in load_more.js (#3402)Nolan Lawson
2017-05-29fix-rails-minor-version (#3403)masarakki
2017-05-29l10n: Fix Japanese translation (#3410)lindwurm
* "メデイア" -> "メディア" Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-05-29Use travis_retry to reduce spurious test failures (#3418)Nolan Lawson
2017-05-28Bump version to 1.4.1Eugen Rochko
2017-05-28Use immutable list in UploadButton to avoid wasteful re-render (#3394)Nolan Lawson
2017-05-28Re-add stream end log for WebSocket (#3397)Clworld
2017-05-28Fix video having black border on top due to regression from #2608 (#3392)Eugen Rochko
The combination of object-fit, relative position 50% from top and translating it back upwards 50% is what allows us to crop the video properly, so it needs to be +50%-50%
2017-05-28Ukrainian translation: fix typo (#3393)ster
2017-05-28Fix IntersectionObserver isIntersecting in Edge (#3365)Nolan Lawson
2017-05-28Bump version to 1.4.0.6Eugen Rochko
2017-05-28Update bootsnap to 0.3.0 (fix xattr.h error) (#3390)Eugen Rochko