| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2018-05-31 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-05-30 | Speed 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-30 | Bump version to 2.4.1rc1 | Eugen Rochko | |
| 2018-05-23 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2018-05-22 | Bump version to 2.4.0 | Eugen Rochko | |
| 2018-05-21 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut 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-21 | Bump version to 2.4.0rc5 | Eugen Rochko | |
| 2018-05-19 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: config/locales/simple_form.ja.yml | |||
| 2018-05-19 | Bump version to 2.4.0rc4 | Eugen Rochko | |
| 2018-05-18 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-05-18 | User agent for WebFinger (#7531) | MIYAGI Hikaru | |
| * User agent for WebFinger * local_domain → web_domain * 'http' is away accidentally... | |||
| 2018-05-14 | Merge branch 'master' into glitch-soc/merge | Thibaut Girka | |
| 2018-05-14 | Bump version to 2.4.0rc3 | Eugen Rochko | |
| 2018-05-14 | Bump version to 2.4.0rc2 | Eugen Rochko | |
| 2018-05-10 | Merge branch 'master' into glitch-soc/master | Thibaut Girka | |
| Conflicts: app/models/account.rb app/views/accounts/_header.html.haml | |||
| 2018-05-06 | Bump version to 2.4.0rc1 (#7283) | Eugen Rochko | |
| 2018-05-04 | Merge remote-tracking branch 'origin/master' into merge-upstream | David Yip | |
| 2018-05-03 | Merge remote-tracking branch 'origin/master' into gs-master | David 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-03 | Fixes/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-02 | Slightly 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-27 | Add 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-23 | tasks/mastodon: fix prompt for Redis password (#7241) | Alejandro Martinez Ruiz | |
| 2018-04-22 | Ability to specify Redis passwd on mastodon:setup (#7222) | David Baucum | |
| Closes #7221 | |||
| 2018-04-20 | Add extract_foreign_key_action to Mastodon::MigrationHelpers (#7195) | Yamagishi Kazutoshi | |
| 2018-04-08 | Point to glitch-soc source and not tootsuite on the public page | Thibaut Girka | |
| (hello AGPLv3) | |||
| 2018-04-03 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-04-02 | Do not default SMTP verify mode to "peer", default to "none" (#6996) | Eugen Rochko | |
| 2018-03-27 | Merge remote-tracking branch 'origin/master' into gs-master | David Yip | |
| 2018-03-27 | Fix 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-25 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-03-24 | Close 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-23 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-03-22 | Bump version to 2.3.2 | Eugen Rochko | |
| 2018-03-22 | Bump version to 2.3.2rc5 | Eugen Rochko | |
| 2018-03-21 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-03-20 | Bump version to 2.3.2rc4 | Eugen Rochko | |
| 2018-03-20 | Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845) | Eugen Rochko | |
| Fix #6816, fix #6790 | |||
| 2018-03-19 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-03-19 | Bump version to 2.3.2rc3 | Eugen Rochko | |
| 2018-03-17 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-03-17 | Bump version to 2.3.2rc2 | Eugen Rochko | |
| 2018-03-17 | Bump version to 2.3.2rc1 | Eugen Rochko | |
| 2018-03-17 | Correct the reference to user's password in mastodon:add_user task (#6800) | Akihiko Odaki | |
| 2018-03-13 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-03-13 | Bump version to 2.3.1 | Eugen Rochko | |
| 2018-03-13 | Bump version to 2.3.1rc3 | Eugen Rochko | |
| 2018-03-12 | Merge remote-tracking branch 'origin/master' into merge-upstream | David Yip | |
| Conflicts: README.md | |||
| 2018-03-12 | Detailed 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-12 | set SAFETY_ASSURED=1 of db:setup in mastodon:setup (#6758) | 艮 鮟鱇 | |
| 2018-03-12 | Bump version to 2.3.1rc2 | Eugen Rochko | |
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |