Skip to content
Snippets Groups Projects
  1. May 25, 2017
  2. May 24, 2017
  3. May 23, 2017
    • Nolan Lawson's avatar
      1fd18a61
    • Akihiko Odaki's avatar
      Cover HomeController more (#3258) · 5d9f4795
      Akihiko Odaki authored
      5d9f4795
    • unarist's avatar
      Fix following/followers API to return correct link headers (#3268) · 3ce9ca4c
      unarist authored
      Link headers in following/followers API should include follow_id as max_id/since_id.
      
      However, these API use current_user's account_id instead of follow_id from #3167.
      This causes irrelevant result on loading more users.
      3ce9ca4c
    • Eugen Rochko's avatar
      Fix Devise destroy method being available to delete user record (#3266) · 2ca1f073
      Eugen Rochko authored
      (You may think that we need account deletions, but this way would've just orphaned the db records)
      2ca1f073
    • beatrix's avatar
    • alpaca-tc's avatar
      Toggle sensitive from admin page (#3261) · 7ee5fc5d
      alpaca-tc authored
      7ee5fc5d
    • Matt Jankowski's avatar
      Refactor of API timeline actions (#3263) · 4289ed1d
      Matt Jankowski authored
      - Increase coverage to exercise all parts of each action
      - Move into namespace to share common code
      - Misc refactor of each action for smaller methods, simpler code
      4289ed1d
    • Daniel Hunsaker's avatar
      Add Support for Nanobox (#1709) · 256e3adc
      Daniel Hunsaker authored
      * Nanobox Support
      
      - Added support for running Mastodon using Nanobox, both for local development, and for deployment to production
      - Dev mode tested and is working properly
      - Deployment is undergoing test as of this writing. If it works, this line will be amended to state success; if not, one or more subsequent commits will provide fixes.
      
      * [nanobox] Resolve Deploy Issues
      
      Everything seems to work except routing to the streaming API. Will investigate with the Nanobox staff and make fix commits if needed.
      
      Changes made:
      - Also need `NODE_ENV` in production
      - Node runs on `:4000`
      - Use `envsubst` to commit `.env.production` values, since `dotEnv` packages don't always support referencing other variables
      - Can't precompile assets after `transform` hook, but do this locally so it only has to be done once.
      - Rails won't create `production.log` on its own, so we do this ourselves.
      - Some `start` commands run from `/data/` for some reason, so use absolute paths in command arguments
      
      * [nanobox] Update Ruby version
      
      * [nanobox] Fix db.rake Ruby code style issues
      
      * [nanobox] Minor Fixes
      
      Some minor adjustments to improve functionality:
      
      - Fixed routing to `web.stream` instances
      - Adjust `.env.nanobox` to properly generate a default `SMTP_FROM_ADDRESS` via `envsubst`
      - Update Nginx configs to properly support the needed HTTP version and headers for proper functionality (the streaming API doesn't work without some of these settings in place)
      
      * [nanobox] Move usage info to docs repo
      
      * [nanobox] Updates for 1.2.x
      
      - Need to leave out `pkg-config` since Nanobox deploys without Ruby's headers - create a gem group to exclude the gem during Nanobox installs, but allow it to remain part of the default set otherwise
      - Update cron jobs to cover new/updated Rake tasks
      - Update `.env.nanobox` to include latest defaults and additions
      
      * [nanobox] Fix for nokogumbo, added in 1.3.x
      
      Apparently, nokogumbo (pulled in by sanitize, added with `OEmbed Support for PreviewCard` (#2337) - 88725d6c) tries to install before nokogiri, despite needing nokogiri available to build properly. Instruct it to use the same settings as nokogiri does when building nokogiri directly, instead of via bundler.
      
      * [nanobox] Set NODE_ENV during asset compile
      
      The switch to WebPack will rely on the local value of the NODE_ENV evar, so set it to production during asset compilation.
      
      * [nanobox] Rebase on master; update Nginx configs
      
      - `pkg-config` Gem no longer causes issues in Nanobox, so revert the Gemfile change which allowed excluding it
      - Update Nginx configuration files with latest recommendations from production documentation
      - Rebase on master to Get This Merged™
      
      Everything should be golden!
      256e3adc
    • Akihiko Odaki's avatar
      Cover StatusesController more (#3259) · 152b4d54
      Akihiko Odaki authored
      152b4d54
    • Akihiko Odaki's avatar
      Cover StreamEntriesController more and remove redundant instructions (#3257) · ea2ef16e
      Akihiko Odaki authored
      * Cover StreamEntriesController more
      
      * Remove redundant instructions in StreamEntriesController
      ea2ef16e
    • Akihiko Odaki's avatar
      Spec AuthorizeFollowsController assigns @account (#3246) · 1d3e0a50
      Akihiko Odaki authored
      @account is used by the view.
      1d3e0a50
Loading