c816701550
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
.travis.yml
Gemfile.lock
README.md
app/controllers/settings/follower_domains_controller.rb
app/controllers/statuses_controller.rb
app/javascript/mastodon/locales/ja.json
app/lib/feed_manager.rb
app/models/media_attachment.rb
app/models/mute.rb
app/models/status.rb
app/services/mute_service.rb
app/views/home/index.html.haml
app/views/stream_entries/_simple_status.html.haml
config/locales/ca.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
config/locales/nl.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/themes.yml
7 years ago
63553c6b5c
Add support for separate Redis for cache ( #7272 )
...
* Add support for separate Redis for cache
CACHE_REDIS_URL to allow using a different Redis server for cache
purposes, with cache-specific configuration such as key eviction
* Fix code style issues
7 years ago
ed490b781f
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
Gemfile.lock
config/application.rb
7 years ago
50529cbceb
Upgrade Rails to version 5.2.0 ( #5898 )
7 years ago
e8aeec4fea
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
61dcb686a8
Fix i18n fallback configuration conflicts with environment configurations ( #6843 )
7 years ago
447d7e6127
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
c110fa62ac
Provide default OTP_SECRET value for development environment ( #6617 )
7 years ago
1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
README.md
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/serializers/rest/instance_serializer.rb
app/views/stream_entries/_simple_status.html.haml
config/locales/simple_form.ja.yml
7 years ago
4072b68686
remove Uglifier call from production.rb ( #6568 )
7 years ago
fa361ccc5e
change referrer policy to same-origin
7 years ago
b75a1ce326
tighten csp
7 years ago
254b74c71f
add memorial to production.rb
...
in memory of Natalie Nguyen
let her name ring through the ether
7 years ago
8d6b9ba494
Merge upstream 2.0ish #165
7 years ago
35a8cafa35
Replace self-rolled statsd instrumention with localshred/nsa ( #5118 )
7 years ago
932571fa22
Merge tag 'v1.6.0' into sync/upstream
7 years ago
3f333a8d31
Set fallback address when empty notification address ( #4868 )
7 years ago
c727eae441
Updated from tootsuite
7 years ago
a3202fd51e
Add SMTP_TLS variable for configuring TLS when server uses non-standard port ( #4227 )
7 years ago
79d898ae0a
Merge upstream!! #64 <3 <3
7 years ago
2083000027
Set default From address in config ( #3756 )
...
The old implementation sets default From address in mailers. It sets
the address from SMTP_FROM_ADDRESS, or notifications@localhost. The
behavior is occasionally undesired results.
In production environment, notifications@localhost is likely to be
incorrect.
In testing environment, the email address should not be varied by a
environment variable.
After appling this change,
In production environment, it will throw an exception when launching
Mastodon.
In testing environment, the address will be fixed with
notifications@localhost.
7 years ago
9bc593d675
update local modifications for cors and cp
8 years ago
b8ea28d6d0
Support multiple trusted proxy ip addresses ( #3639 )
...
* Support multiple trusted proxy ip addresses
* correct coding style
8 years ago
2212dc4aaa
Update Rails to version 5.1.1 ( #3121 )
...
* 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
8 years ago
df92f010ad
Set config.cache_store in environments file. ( #3219 )
...
* Set config.cache_store in application.rb
* Set config.cache_store in environments.
* fix code format.
8 years ago
ef226a6f22
Remove rails_12factor ( #2901 )
8 years ago
b8e166894b
Fix Scheduler::SubscriptionsScheduler ( #2834 )
...
* Fix Scheduler::SubscriptionsScheduler, add worker test for it
* Change production log level of Sidekiq to "warn" instead of "info"
8 years ago
c997091166
Clean up redis configuration. Allow using REDIS_URL to set advanced ( #2732 )
...
connection options instead of setting REDIS_HOST etc individually
Close #1986
8 years ago
f5bf5ebb82
Replace sprockets/browserify with Webpack ( #2617 )
...
* 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
8 years ago
26bc591572
Allow to set CA file for SMTP ( #2713 )
8 years ago
a0dd90a397
Return force_ssl to the controller ( #2380 )
8 years ago
57cd6546c3
Make HSTS enable optional with force_ssl ( #2364 )
8 years ago
ee82d8a876
Move force_ssl check to production config ( #2165 )
...
The force_ssl method from controllers does not add all of the options that the
sitewide configuration in a config block does. For example, HSTS enforcement is
not added by the controller method, but is added by this style.
8 years ago
b79ba3db8a
Send nil for SMTP_LOGIN or SMTP_PASSWORD if it was left blank in the envfile, otherwise Ruby still attempts auth even if SMTP_AUTH_METHOD is none ( #2180 )
8 years ago
e9eaf9e33c
Allow using an SMTP server without authentication ( #1597 )
...
* Allow using an SMTP server without authentication (e.g Postfix relay on the same host) by setting SMTP_LOGIN and SMTP_AUTH_METHOD to 'none'
* Add note in .env.production.sample about SMTP settings for servers where no auth is required
* Assume that SMTP_LOGIN and SMTP_PASSWORD will be blank if we set SMTP_AUTH_METHOD to none
8 years ago
7609593e48
Add REDIS_DB env variable to configure Redis database ( #1366 )
8 years ago
c019b0acfd
Modify ActionMailer configuration to default to ENV['LOCAL_DOMAIN'] if ENV['SMTP_DOMAIN'] is not set. The previous fallback, config.x.local_domain, is undefined when the code is called. ( #1745 )
8 years ago
d9dc0fe84e
smtp delivery type fix ( #1556 )
...
* delivery fix
# Conflicts:
# config/environments/production.rb
* added stub in .env file
* reordered and added a comment
8 years ago
40bdf43297
Change default log level in production from :debug to :info for less I/O ( #1579 )
8 years ago
5cdd2c2414
Fix #1535 - #1372 set a wrong default on :openssl_verify_mode ( #1563 )
8 years ago
0dbbc16c69
More SMTP customization ( #1372 )
...
* Allow SMTP auth method customization
* Add SMTP openssl_verify_mode option support
Allows one use self-signed certs with their SMTP server.
* Add SMTP enable_starttls_auto option support
8 years ago
c3e7bac1cc
Allows setting log level in env variable ( #1290 )
...
* Allows setting log level in env variable.
* Made changes based on feedback in #1290 .
8 years ago
6b81d10030
Add digest e-mails
8 years ago
9d4cad6307
Improve glow
8 years ago
19b9e1e2c3
Preheat status cache
8 years ago
1da0ce5c7c
Looks like log level :debug is required for activerecord times to be tracked
8 years ago
65402d9c09
Fix activerecord logging in production
8 years ago
67befe5463
Allow to specify trusted proxies through env
8 years ago
f051c2e813
Fix statsd null backend not being initialized properly
8 years ago
306eb6e9c9
Add optional StatsD performance tracking
8 years ago
ab4f5f5da5
Add Heroku deployment support
8 years ago
cc70f28f19
Adding rack timeout of 30sec, PuSH jobs moved to push queue so they
...
can be processed separately
8 years ago
6c82dfcf5f
Fix CDN_HOST variable requirement
8 years ago
4f1d863615
Only distribute statuses to followers who signed in in the last 2 weeks, add rake task for clearing feeds of inactive users
8 years ago
7944ed6fe5
Adding option to specify asset server, filter followers query by local accounts
...
during Fan Out On Write to load less stuff into memory
8 years ago
dbe00a4156
Improved configuration from ENV, cleaned up timeline filter methods
...
to be more readable, add extra logging to process feed service
8 years ago
53fb7b1aa8
Replace in-memory cache store with redis store, should decrease memory
...
footprint of each running process by 128mb
8 years ago
a9e40a3d80
Adding OAuth access scopes, fixing OAuth authorization UI, adding rate limiting
...
to the API
8 years ago
dd02fc0ec4
More debugging
8 years ago
6611e3a2ef
More debugging
8 years ago
4baca34a45
Do not compress JS (perhaps it removes source maps, needed for debugging)
8 years ago
fe77921e47
Catching more exceptions that slipped through, removing AR logging from
...
production as it's very verbose and not very useful
8 years ago
0f4bc56719
Improving production logs, removing n+1 on media attachments in atom,
...
adding attachments display to static views
8 years ago
413e700fe0
Enhancing test suite but I think the problem might have been caching setting
8 years ago
49520d6e62
Adding React.js, Redux, revamping dashboard
8 years ago
68c93f8b85
Final fix for ActionCable origin issues
8 years ago
8985f8e66c
Fixing more configuration issues with ActionCable
8 years ago
8459acd123
Fix for force SSL issue with websockets
8 years ago
10ba09f546
Upgrade to Rails 5.0.0.1
8 years ago
6c480c8429
Oops, typo
9 years ago
85b00d19b8
Moving Salmon notifications to background processing, fixing mini-profiler
...
behaviour with Turbolinks enabled, optimizing Rabl for production
9 years ago
48d66a2055
Fixing the docker container setup (with assets compilation &co)
9 years ago
2c374cd97c
Adding e-mail configuration
9 years ago
9c4856bdb1
Initial commit
9 years ago
David Yip
Eugen Rochko
Yamagishi Kazutoshi
Jenkins
Akihiko Odaki
beatrix
kibigo!
Ondřej Hruška
nullkal
Matt Jankowski
Clworld
alpaca-tc
Miguel Jacq
Les Orchard
Effy Elden
James Moore
Alexander Mankuta
Ash Furrow
Effy Elden