252 Commits (893f2aff2052b0809c70afac8a27b3e164635b44)

Author	SHA1	Message	Date
Thibaut Girka	e0ef89c73f	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
Eugen Rochko	7745a22ec7	Bump version to 2.4.0	8 years ago
Thibaut Girka	a4c9bda771	Merge branch 'master' into glitch-soc/merge-upstream ... 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.	8 years ago
Eugen Rochko	292c987522	Bump version to 2.4.0rc5	8 years ago
Thibaut Girka	b481e4fac1	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/simple_form.ja.yml	8 years ago
Eugen Rochko	bcbb6aa46f	Bump version to 2.4.0rc4	8 years ago
Jenkins	4c0770d6c8	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
MIYAGI Hikaru	919eef3098	User agent for WebFinger (#7531) ... * User agent for WebFinger * local_domain → web_domain * 'http' is away accidentally...	8 years ago
Thibaut Girka	ba7ee67498	Merge branch 'master' into glitch-soc/merge	8 years ago
Eugen Rochko	8756fd1e82	Bump version to 2.4.0rc3	8 years ago
Eugen Rochko	d75b63e4fb	Bump version to 2.4.0rc2	8 years ago
Thibaut Girka	1c9c0167b7	Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	8 years ago
Eugen Rochko	50ed1e83ac	Bump version to 2.4.0rc1 (#7283)	8 years ago
David Yip	da70208b45	Merge remote-tracking branch 'origin/master' into merge-upstream	8 years ago
David Yip	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	8 years ago
ThibG	a24605961a	Fixes/do not override timestamps (#7336) ... * Revert "Fixes/do not override timestamps (#7331)" This reverts commit 581a5c9d29. * 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	8 years ago
Eugen Rochko	cb5b5cb5f7	Slightly reduce RAM usage (#7301) ... * 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	8 years ago
Eugen Rochko	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	8 years ago
Alejandro Martinez Ruiz	06817b3c1f	tasks/mastodon: fix prompt for Redis password (#7241)	8 years ago
David Baucum	ca9192d9ba	Ability to specify Redis passwd on mastodon:setup (#7222) ... Closes #7221	8 years ago
Yamagishi Kazutoshi	084cf0babf	Add extract_foreign_key_action to Mastodon::MigrationHelpers (#7195)	8 years ago
Thibaut Girka	88bcfaeb18	Point to glitch-soc source and not tootsuite on the public page ... (hello AGPLv3)	8 years ago
Jenkins	6611100480	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	36eac8ba90	Do not default SMTP verify mode to "peer", default to "none" (#6996)	8 years ago
David Yip	d2cdc2b5a3	Merge remote-tracking branch 'origin/master' into gs-master	8 years ago
Eugen Rochko	2a90da1837	Fix UniqueUsernameValidator comparison (#6926) ... 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	8 years ago
Jenkins	837b3804bf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Akihiko Odaki	54b273bf99	Close http connection in perform method of Request class (#6889) ... 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.	8 years ago
Jenkins	03b2f701e7	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	6cc432bbc4	Bump version to 2.3.2	8 years ago
Eugen Rochko	dafae9818d	Bump version to 2.3.2rc5	8 years ago
Jenkins	6290cd7969	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	f64af6473f	Bump version to 2.3.2rc4	8 years ago
Eugen Rochko	ac49c7932d	Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845) ... Fix #6816, fix #6790	8 years ago
Jenkins	df70571bfe	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	74c39fada0	Bump version to 2.3.2rc3	8 years ago
Jenkins	9341b982b6	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	092f1df9d0	Bump version to 2.3.2rc2	8 years ago
Eugen Rochko	cdf8b92fea	Bump version to 2.3.2rc1	8 years ago
Akihiko Odaki	338bff8b93	Correct the reference to user's password in mastodon:add_user task (#6800)	8 years ago
Jenkins	d75a6054a0	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	2ef1ce1182	Bump version to 2.3.1	8 years ago
Eugen Rochko	79d3a8553f	Bump version to 2.3.1rc3	8 years ago
David Yip	f8e934f955	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md	8 years ago
Ushitora Anqou	051b649628	Detailed SMTP setup (#6759) ... * 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	8 years ago
艮 鮟鱇	f5f165a5eb	set SAFETY_ASSURED=1 of db:setup in mastodon:setup (#6758)	8 years ago
Eugen Rochko	f89ff65ec7	Bump version to 2.3.1rc2	8 years ago
Eugen Rochko	ab27dccba5	Bump version to 2.3.1rc1	8 years ago
Jenkins	e553905ba7	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	6e309f5e45	Bump version to 2.3.0	8 years ago