1. 22 Apr, 2019 1 commit
  2. 04 Jan, 2019 1 commit
  3. 28 Dec, 2018 1 commit
    • Ben Lubar's avatar
      Add healthcheck commands to docker-compose.yml (#9143) · 9b475a48
      Ben Lubar authored
      This will allow Docker to be automatically check the health of services.
      
      Docker won't do anything other than showing the state in the output of
      "docker-compose ps" by default, but some management tools may watch for
      container health events.
      
      Here's what my local instance looks like right now:
      
                Name                        Command                  State                     Ports
      -------------------------------------------------------------------------------------------------------------
      mastodon_db_1              docker-entrypoint.sh postgres    Up (healthy)
      mastodon_es_1              /usr/local/bin/docker-entr ...   Up (healthy)
      mastodon_redis_1           docker-entrypoint.sh redis ...   Up (healthy)
      mastodon_redis_cache_1     docker-entrypoint.sh redis ...   Up (healthy)
      mastodon_sidekiq_1         /sbin/tini -- bundle exec  ...   Up             3000/tcp, 4000/tcp
      mastodon_streaming_1       /sbin/tini -- yarn start         Up (healthy)   3000/tcp, 127.0.0.1:4000->4000/tcp
      mastodon_web_1             /sbin/tini -- bash -c rm - ...   Up (healthy)   127.0.0.1:3000->3000/tcp, 4000/tcp
      9b475a48
  4. 22 Oct, 2018 1 commit
  5. 13 Sep, 2018 1 commit
    • luzpaz's avatar
      Misc. typos (#8694) · 40dd19be
      luzpaz authored
      Found via `codespell -q 3 --skip="./app/javascript/mastodon/locales,./config/locales"`
      40dd19be
  6. 02 Sep, 2018 1 commit
  7. 09 Aug, 2018 1 commit
    • Aaron Brady's avatar
      Update docker-compose to cope with build-time assets (#8156) · 8c279b16
      Aaron Brady authored
      #7780 means that asset compilation happens as a build step.
      
      Having the assets and packs volumes defined in `docker-compose.yml` breaks this. For people who run under Docker Compose, I believe this will fix their CSS (which even running the asset recompilation separately did not).
      8c279b16
  8. 02 Jul, 2018 2 commits
    • MIYAGI Hikaru's avatar
      Merge `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` into `ALLOW_ACCESS_TO_HIDDEN_SERVICE` (#7901) · e190203e
      MIYAGI Hikaru authored
      If Mastodon accesses to the hidden service via transparent proxy, it's needed to avoid checking whether it's a private address, since `.onion` is resolved to a private address.
      I was previously using the `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` to provide that function. However, I realized that using `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` is redundant, since this specification is always used with `ALLOW_ACCESS_TO_HIDDEN_SERVICE`. Therefore, I decided to integrate the setting of `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` into` ALLOW_ACCESS_TO_HIDDEN_SERVICE`.
      e190203e
    • J Yeary's avatar
      TOR federation (#7875) · 42342a7c
      J Yeary authored
      42342a7c
  9. 29 Jun, 2018 1 commit
    • MIYAGI Hikaru's avatar
      Merge `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` into `ALLOW_ACCESS_TO_HIDDEN_SERVICE` (#7901) · ddd0bb69
      MIYAGI Hikaru authored
      If Mastodon accesses to the hidden service via transparent proxy, it's needed to avoid checking whether it's a private address, since `.onion` is resolved to a private address.
      I was previously using the `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` to provide that function. However, I realized that using `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` is redundant, since this specification is always used with `ALLOW_ACCESS_TO_HIDDEN_SERVICE`. Therefore, I decided to integrate the setting of `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` into` ALLOW_ACCESS_TO_HIDDEN_SERVICE`.
      ddd0bb69
  10. 26 Jun, 2018 1 commit
  11. 25 May, 2018 1 commit
  12. 15 Apr, 2018 1 commit
  13. 07 Mar, 2018 1 commit
  14. 06 Mar, 2018 1 commit
    • Akihiko Odaki's avatar
      Do not use npm (#6656) · 81cefc19
      Akihiko Odaki authored
      Both of yarn and npm are used in Mastodon, but the combined usage requires
      a redundant dependency and may lead to data inconsistency.
      
      Considering that yarn has autoclean feature which npm does not have,
      this change replaces all npm usage with yarn.
      
      This change requires documentation update. Most notably, the following
      command must be executed before assets precompilation if any system
      dependency of node-sass has changed:
      
      yarn install --force --pure-lockfile
      81cefc19
  15. 09 Feb, 2018 1 commit
    • Eugen Rochko's avatar
      Full-text search for authorized statuses (#6423) · 3ebc0ad4
      Eugen Rochko authored
      * Add full-text search for authorized statuses
      
      - Search API will return statuses that match the query
      - Only for logged in users
      - Only if you are author of the status,
      - Or you were mentioned in it
      - Or you favourited or reblogged it
      - Configuration over `ES_ENABLED`, `ES_HOST`, `ES_PORT`, `ES_PREFIX`
      - Run `rails chewy:deploy` to create & populate index
      
      Fix #5880
      Fix #4293
      Fix #1152
      
      * Add commented out docker-compose configuration for ES container
      
      * Optimize index import, filter search results
      
      * Add basic normalization to the index
      
      * Add better stemming and normalization to the index
      
      * Skip webfinger request if search query includes both @ and a space
      
      * Fix code style
      
      * Visually separate search result sections
      
      * Fix code style issues
      3ebc0ad4
  16. 03 Feb, 2018 1 commit
  17. 24 Jan, 2018 1 commit
  18. 06 Oct, 2017 1 commit
    • unarist's avatar
      Specify middleware versions in docker-compose.yml (#5247) · c75ca052
      unarist authored
      PostgreSQL10 has been released, but upgrading from older versions needs dump/restore. If you pull new version without those handling, db service will fail to launch.
      
      To prevent accidentally upgrading, and as a recommended version, this patch specifies PostgreSQL and Redis version.
      c75ca052
  19. 04 May, 2017 1 commit
  20. 03 May, 2017 1 commit
    • Eugen Rochko's avatar
      Replace sprockets/browserify with Webpack (#2617) · f5bf5ebb
      Eugen Rochko authored
      * Replace browserify with webpack
      
      * Add react-intl-translations-manager
      
      * Do not minify in development, add offline-plugin for ServiceWorker background cache updates
      
      * Adjust tests and dependencies
      
      * Fix production deployments
      
      * Fix tests
      
      * More optimizations
      
      * Improve travis cache for npm stuff
      
      * Re-run travis
      
      * Add back support for custom.scss as before
      
      * Remove offline-plugin and babili
      
      * Fix issue with Immutable.List().unshift(...values) not working as expected
      
      * Make travis load schema instead of running all migrations in sequence
      
      * Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of
      React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in
      <UI />
      
      * Add react definitions to places that use JSX
      
      * Add Procfile.dev for running rails, webpack and streaming API at the same time
      f5bf5ebb
  21. 15 Apr, 2017 1 commit
  22. 11 Apr, 2017 1 commit
  23. 08 Apr, 2017 1 commit
  24. 05 Apr, 2017 1 commit
  25. 04 Apr, 2017 1 commit
  26. 03 Apr, 2017 2 commits
  27. 03 Feb, 2017 1 commit
    • Eugen Rochko's avatar
      Make the streaming API also handle websockets (because trying to get the... · ccb8ac85
      Eugen Rochko authored
      Make the streaming API also handle websockets (because trying to get the browser EventSource interface to
      work flawlessly was a nightmare). WARNING: This commit makes the web UI connect to the streaming API instead
      of ActionCable like before. This means that if you are upgrading, you should set that up beforehand.
      ccb8ac85
  28. 29 Nov, 2016 1 commit
  29. 24 Nov, 2016 1 commit
  30. 25 Oct, 2016 1 commit
  31. 15 Oct, 2016 2 commits
  32. 25 Mar, 2016 1 commit
  33. 16 Mar, 2016 1 commit
  34. 14 Mar, 2016 1 commit