about summary refs log tree commit diff
path: root/lib
AgeCommit message (Collapse)Author
2018-05-10Merge branch 'master' into glitch-soc/masterThibaut Girka
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml
2018-05-06Bump version to 2.4.0rc1 (#7283)Eugen Rochko
2018-05-04Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-05-03Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
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
2018-05-03Fixes/do not override timestamps (#7336)ThibG
* Revert "Fixes/do not override timestamps (#7331)" This reverts commit 581a5c9d29ef2a12f46b67a1097a9ad6df1c6953. * Document Snowflake ID corner-case a bit more Snowflake IDs are used for two purposes: making object identifiers harder to guess and ensuring they are in chronological order. For this reason, they are based on the `created_at` attribute of the object. Unfortunately, inserting items with older snowflakes IDs will break the assumption of consumers of the paging APIs that new items will always have a greater identifier than the last seen one. * Add `override_timestamps` virtual attribute to not correlate snowflake ID with created_at
2018-05-02Slightly reduce RAM usage (#7301)Eugen Rochko
* No need to re-require sidekiq plugins, they are required via Gemfile * Add derailed_benchmarks tool, no need to require TTY gems in Gemfile * Replace ruby-oembed with FetchOEmbedService Reduce startup by 45382 allocated objects * Remove preloaded JSON-LD in favour of caching HTTP responses Reduce boot RAM by about 6 MiB * Fix tests * Fix test suite by stubbing out JSON-LD contexts
2018-04-27Add support for separate Redis for cache (#7272)Eugen Rochko
* 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
2018-04-23tasks/mastodon: fix prompt for Redis password (#7241)Alejandro Martinez Ruiz
2018-04-22Ability to specify Redis passwd on mastodon:setup (#7222)David Baucum
Closes #7221
2018-04-20Add extract_foreign_key_action to Mastodon::MigrationHelpers (#7195)Yamagishi Kazutoshi
2018-04-08Point to glitch-soc source and not tootsuite on the public pageThibaut Girka
(hello AGPLv3)
2018-04-03Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-04-02Do not default SMTP verify mode to "peer", default to "none" (#6996)Eugen Rochko
2018-03-27Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-03-27Fix UniqueUsernameValidator comparison (#6926)Eugen Rochko
Comparison was downcasing only one side, therefore if previously existing account had a non-lowercase spelling, it would be ignored when checking for duplicates. New rake task `mastodon:maintenance:find_duplicate_usernames` will help find constraint violations that might have occured from the presence of this bug. Bump version to 2.3.3
2018-03-25Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-24Close http connection in perform method of Request class (#6889)Akihiko Odaki
HTTP connections must be explicitly closed in many cases, and letting perform method close connections makes its callers less redundant and prevent them from forgetting to close connections.
2018-03-23Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-22Bump version to 2.3.2Eugen Rochko
2018-03-22Bump version to 2.3.2rc5Eugen Rochko
2018-03-21Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-20Bump version to 2.3.2rc4Eugen Rochko
2018-03-20Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845)Eugen Rochko
Fix #6816, fix #6790
2018-03-19Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-19Bump version to 2.3.2rc3Eugen Rochko
2018-03-17Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-17Bump version to 2.3.2rc2Eugen Rochko
2018-03-17Bump version to 2.3.2rc1Eugen Rochko
2018-03-17Correct the reference to user's password in mastodon:add_user task (#6800)Akihiko Odaki
2018-03-13Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-13Bump version to 2.3.1Eugen Rochko
2018-03-13Bump version to 2.3.1rc3Eugen Rochko
2018-03-12Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: README.md
2018-03-12Detailed SMTP setup (#6759)Ushitora Anqou
* add detailed SMTP settings setup in mastodon:setup * add localhost SMTP settings setup in mastodon:setup * SMTP settings setup should exit after successful delivery of test mail
2018-03-12set SAFETY_ASSURED=1 of db:setup in mastodon:setup (#6758)艮 鮟鱇
2018-03-12Bump version to 2.3.1rc2Eugen Rochko
2018-03-11Bump version to 2.3.1rc1Eugen Rochko
2018-03-09Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-09Bump version to 2.3.0Eugen Rochko
2018-03-09When inside Docker, output saved configuration during mastodon:setup (#6711)Eugen Rochko
2018-03-09Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-08Bump version to 2.3.0rc3Eugen Rochko
2018-03-08After blocking domain with reject_media, invalidate cache (#6679)Eugen Rochko
Media attachments are part of the association cache of statuses, since they are presumed to be immutable. Unless this cache is cleared manually, the statuses will continue to look like they have media embedded.
2018-03-07Bump version to 2.3.0rc2Eugen Rochko
2018-03-06Fix #3807: Increase avatars to 400x400 max (#6651)Eugen Rochko
But do not upscale when they are smaller
2018-03-04Do not fetch environment variables to determine default locale (#6618)Akihiko Odaki
The default locale is now set by config.
2018-03-02Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
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
2018-03-01Fixes #6584 (#6585)Thomas Leister
2018-03-01Bump version to 2.3.0rc1Eugen Rochko
2018-02-28Fix #942: Seamless LDAP login (#6556)Eugen Rochko
generated by cgit-pink (git 2.37.1) at 2024-11-25 14:56:08 +0000