about summary refs log tree commit diff
path: root/lib
AgeCommit message (Collapse)Author
2018-07-16Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x
2018-07-14Fix static GIFs being saved as empty files when using local storage (#8012)Eugen Rochko
Fix #7997 Fix #6237
2018-07-11Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-07-11Bump version to 2.4.3Eugen Rochko
2018-07-11Bump version to 2.4.3rc3Eugen Rochko
2018-07-09Merge branch 'master' into glitch-soc/tentative-mergeThibaut Girka
Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.
2018-07-07Bump version to 2.4.3rc2Eugen Rochko
2018-07-05Bump version to 2.4.3rc1Eugen Rochko
2018-06-21Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields
2018-06-19Bump version to 2.4.2Eugen Rochko
2018-06-19Bump version to 2.4.2rc3Eugen Rochko
2018-06-18Bump version to 2.4.2rc2Eugen Rochko
2018-06-15Bump version to 2.4.2rc1Eugen Rochko
2018-06-12Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-06-10Bump version to 2.4.1Eugen Rochko
2018-06-10Bump version to 2.4.1rc4Eugen Rochko
2018-06-07Merge remote-tracking branch 'tootsuite/master' into merge-upstreamDavid Yip
Conflicts: app/models/status.rb The conflict in the Status model was due to https://github.com/tootsuite/mastodon/commit/5bf500338478f819a65d25636a0af61a482972d3. It was resolved by accepting tootsuite's changes.
2018-06-06Bump version to 2.4.1rc3Eugen Rochko
2018-06-05Bump version to 2.4.1rc2Eugen Rochko
2018-06-04Fix missing column in select in mastodon:feeds:build task (#7720)Eugen Rochko
2018-05-31Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-05-30Speed up some rake tasks by moving execution to Sidekiq (#7678)Eugen Rochko
* Speed up some rake tasks by moving execution to Sidekiq mastodon:media:remove_silenced mastodon:media:remove_remote mastodon:media:redownload_avatars mastodon:feeds:build * Fix code style issue
2018-05-30Bump version to 2.4.1rc1Eugen Rochko
2018-05-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-05-22Bump version to 2.4.0Eugen Rochko
2018-05-21Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: app/javascript/styles/mastodon-light.scss config/locales/en.yml config/locales/fr.yml config/locales/simple_form.pl.yml config/themes.yml Conflicts resolved by deleting config/themes.yml, marking app/javascript/styles/mastodon-light.scss as added, and taking all new translation strings, not removing anything from them.
2018-05-21Bump version to 2.4.0rc5Eugen Rochko
2018-05-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: config/locales/simple_form.ja.yml
2018-05-19Bump version to 2.4.0rc4Eugen Rochko
2018-05-18Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-05-18User agent for WebFinger (#7531)MIYAGI Hikaru
* User agent for WebFinger * local_domain → web_domain * 'http' is away accidentally...
2018-05-14Merge branch 'master' into glitch-soc/mergeThibaut Girka
2018-05-14Bump version to 2.4.0rc3Eugen Rochko
2018-05-14Bump version to 2.4.0rc2Eugen Rochko
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
generated by cgit-pink (git 2.37.1) at 2024-11-09 22:42:22 +0000