Commit Graph

3318 Commits

Author SHA1 Message Date
Matt Jankowski
4289ed1d13 Refactor of API timeline actions ()
- 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
2017-05-23 18:11:39 +02:00
Daniel Hunsaker
256e3adc1d Add Support for Nanobox ()
* 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` () - 88725d6) 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!
2017-05-23 16:54:44 +02:00
Akihiko Odaki
152b4d54e8 Cover StatusesController more () 2017-05-23 16:34:28 +02:00
Akihiko Odaki
ea2ef16ea4 Cover StreamEntriesController more and remove redundant instructions ()
* Cover StreamEntriesController more

* Remove redundant instructions in StreamEntriesController
2017-05-23 15:04:23 +02:00
Akihiko Odaki
1d3e0a5060 Spec AuthorizeFollowsController assigns @account ()
@account is used by the view.
2017-05-23 13:12:45 +02:00
Akihiko Odaki
bf575a1f5e Introduce recent to Follow ()
Introduce recent to Follow, as Account and other models have.
This change also adds specs for the scope and the dependents.
2017-05-23 13:12:19 +02:00
Yamagishi Kazutoshi
860ffc0560 Focus the submit button ()
Focus the submit button when confirmation modal is opened.

Also, changed cancellation link to button.
This makes the meaning clearer.
2017-05-23 13:10:41 +02:00
Audun Larsen
7eb4abe20a Updates Norwegian translation () 2017-05-23 13:09:53 +02:00
Ira
1baa75f79f i18n: Latest Hebew strings translated () 2017-05-23 13:08:16 +02:00
Yamagishi Kazutoshi
1d436a4322 Refactoring. Removed useless import. ()
original: https://github.com/tootsuite/mastodon/pull/2618
2017-05-23 13:08:01 +02:00
Akihiko Odaki
8fd174298d Cover AccountsController more in spec ()
* Introduce recent scope to Status and StreamEntry

Introduce recent scope to Status and StreamEntry as Account has.

* Cover AccountsController more in AccountsController
2017-05-23 02:53:01 +02:00
Eugen Rochko
9afd7dadbf Fix more locale regressions from () 2017-05-23 02:50:04 +02:00
Matt Jankowski
8e84177305 Use local default for postgres host in node streaming service ()
This location varies across postgres installations, and it seems like the pg
package knows how to guess correctly on each system.
2017-05-22 20:27:24 -04:00
Matt Jankowski
a28ce13b3e Coverage for api/web/settings controller () 2017-05-22 23:12:28 +02:00
Matt Jankowski
e1b42e9aa0 Add coverage for ReportFilter and AccountFilter () 2017-05-22 15:50:58 -04:00
Eugen Rochko
b51398d0dd Bump version 2017-05-22 21:38:19 +02:00
Matt Jankowski
ec34ec63b1 Specs for cleanup workers ()
* Add spec files for feed and media cleanup workers

* Add coverage for feed and media cleanup schedulers

* Clean up feed and media cleanup workers
2017-05-22 19:36:21 +02:00
Eugen Rochko
4a4733b397 Similarly to , put creation of remote statuses in a transaction, ()
so that public timeline/caching would not encounter incomplete data
2017-05-22 19:35:48 +02:00
Akihiko Odaki
bda7391221 Cover ApplicationController more in spec () 2017-05-22 17:58:57 +02:00
Akihiko Odaki
b9e8ffbd12 Cover AccountUnfollowController more in spec () 2017-05-22 17:58:49 +02:00
Tomonori Murakami
7966d3a872 Fix locale bug when change it on preferences () () 2017-05-22 17:58:41 +02:00
Akihiko Odaki
422e4d897b Cover AccountFollowController more in spec () 2017-05-22 16:29:48 +02:00
Akihiko Odaki
cb2707776f Cover AboutController more in spec () 2017-05-22 16:27:19 +02:00
Eugen Rochko
48e7a22e34 Fix locale regression from () 2017-05-22 16:26:54 +02:00
Ratmir Karabut
2bb5486357 Update Russian translation ()
* Add Russian translation (ru)

* Fix a missing comma

* Fix the wording for better consistency

* Update Russian translation

* Arrange Russian setting alphabetically

* Fix syntax error

* Update Russian translation

* Fix formatting error

* Update Russian translation

* Update Russian translation

* Update ru.jsx

* Fix syntax error

* Remove two_factor_auth.warning (appears obsolete)

* Add missing strings in ru.yml

A lot of new strings translated, especially for the newly added admin section

* Fix translation consistency

* Update Russian translation

* Update Russian translation (pluralizations)

* Update Russian translation

* Update Russian translation
2017-05-22 16:03:50 +02:00
Nolan Lawson
60e2b951de Add webpack-bundle-analyzer for production builds () 2017-05-22 15:42:11 +02:00
Immae
a94c152fd3 Allow alternate domains for mastodon handlers () 2017-05-22 15:40:04 +02:00
Nolan Lawson
9d04de1c8d Only load Intl data for current language ()
* Only load Intl data for current language

* Extract common chunk only from application.js and public.js

* Generate locale packs, avoid caching on window object
2017-05-22 15:06:06 +02:00
Yamagishi Kazutoshi
73e4468ff3 Change "Account.any?" to "Account.exists?" () 2017-05-22 15:02:30 +02:00
m4sk1n
fbbd80b40b Updated Polish translation ()
* i18n: updated Polish translation

Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>

* i18n: completed Polish translation

Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>

* i18n: corrected Polish translation

Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>

* i18n: Updated Polish translation

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>

* Update simple_form.pl.yml

* Update simple_form.pl.yml
2017-05-22 15:01:53 +02:00
unarist
361a606edb Keep children of the column-collapsable until the transition is completed () 2017-05-22 15:01:27 +02:00
Clworld
df92f010ad Set config.cache_store in environments file. ()
* Set config.cache_store in application.rb

* Set config.cache_store in environments.

* fix code format.
2017-05-22 15:01:02 +02:00
unarist
07af8c05fd Fix "Edit profile" on the account action bar () 2017-05-22 14:57:50 +02:00
Akihiko Odaki
aa662cecad single_user_mode? always returns boolean ()
This change also adds a specification for the method.
2017-05-22 06:00:06 +02:00
Yamagishi Kazutoshi
84608c3ff8 Add translations for counter of profile ()
ref 
2017-05-22 04:45:55 +02:00
Masoud Abkenar
b69365e397 Persian translation update ()
* Persian translation update

* Persian translation update: new files

* Persian translation update

* activerecord.fa.yml language code

* Persian translation update

* fix indent
2017-05-22 00:20:13 +02:00
Eugen Rochko
a478af92c3 Fix forgotten to include language attribute in statuses JSON () 2017-05-21 21:38:09 +02:00
happycoloredbanana
7fba4cb3d1 Allow access token in URI () 2017-05-21 21:13:11 +02:00
ster
a4c757767f Update Ukrainian translation () 2017-05-21 18:52:50 +02:00
Akihiko Odaki
2af5cd96fe Fix mutes_controller error and incorrect statuses_controller report ()
This commit fixes a regression in commit
f554807563.
2017-05-21 13:32:13 +02:00
Hayato IZUMI
860f408475 Update .gitignore ()
* Remove duplicate 'node_modules'
* Replace 'public/packs'
2017-05-21 11:24:59 +02:00
vidarlee
440441ccb3 Enhance for the Chinese translation ()
* Enhance for the Chinese translation

* Add filtered_languages for Chinese Translation include CN/HK/TW for PR 
2017-05-21 11:23:59 +02:00
Daigo 3 Dango
3eb13307ca Add a Japanese translation for PR () 2017-05-21 01:16:54 +02:00
Eugen Rochko
756db8103a Bump version to 1.4.0.2 () 2017-05-20 23:30:20 +02:00
Eugen Rochko
20c0054460 Adjust REDIS_URL usage in node_redis ()
Resolves 
2017-05-20 21:06:09 +02:00
Wonderfall
ae78d012ac Some Dockerfile improvements ()
- improve docker_entrypoint.sh
- serve static files with puma by default
- sort packages list
- use virtual package for build deps
- show how to assign UID/GID
2017-05-20 20:01:05 +02:00
Eugen Rochko
ef900789bc Replace mastodon:media:clear and mastodon:feeds:clear rake tasks with ()
sidekiq-scheduler jobs

Resolves 
2017-05-20 19:42:58 +02:00
Eugen Rochko
d78f555254 Improve language filter preferences look () 2017-05-20 19:42:44 +02:00
Eugen Rochko
c2f70829d9 Adds bootsnap. Faster boot time () 2017-05-20 19:42:27 +02:00
Yamagishi Kazutoshi
b280c387c8 Add MS Edge support to public.js () 2017-05-20 18:15:43 +02:00