chuckya

Author	SHA1	Message	Date
Thibaut Girka	1d6152f440	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.	2019-03-20 13:54:00 +01:00
dependabot[bot]	941b0adcae	Bump aws-sdk-s3 from 1.32.0 to 1.33.0 (#10319 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.32.0 to 1.33.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.32.0...v1.33.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-03-19 16:34:21 +01:00
dependabot[bot]	c95e3a2e34	Bump rubocop from 0.65.0 to 0.66.0 (#10318 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.65.0 to 0.66.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.65.0...v0.66.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-03-19 16:34:04 +01:00
Thibaut Girka	291012ec0c	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/accounts_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/statuses_controller.rb All conflicts caused by the additional `use_pack` used for glitch-soc's theming system.	2019-03-18 18:03:27 +01:00
dependabot[bot]	f85b66eb8c	Bump brakeman from 4.4.0 to 4.5.0 (#10309 ) Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.4.0 to 4.5.0. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v4.4.0...v4.5.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-03-18 14:41:44 +01:00
Thibaut Girka	4df3b7cb06	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up.	2019-03-16 14:14:20 +01:00
Yamagishi Kazutoshi	8347479f5d	Bump webpacker from 3.5.5 to 4.0.2 (#10277 ) Bumps [webpacker](https://github.com/rails/webpacker) from 3.5.5 to 4.0.2. - [Release notes](https://github.com/rails/webpacker/releases) - [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/webpacker/compare/v3.5.5...v4.0.2) Signed-off-by: dependabot[bot] <support@dependabot.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2019-03-15 15:05:31 +01:00
dependabot[bot]	5a9978f02a	Bump aws-sdk-s3 from 1.31.0 to 1.32.0 (#10279 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.31.0 to 1.32.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.31.0...v1.32.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-03-15 14:53:34 +01:00
Thibaut Girka	f3e7634156	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-11 17:31:02 +01:00
dependabot[bot]	c8122e84cc	Bump aws-sdk-s3 from 1.30.1 to 1.31.0 (#10236 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.30.1 to 1.31.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.30.1...1.31.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-03-11 15:29:07 +01:00
Thibaut Girka	4806232997	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-06 11:29:06 +01:00
dependabot[bot]	ad6f7ea250	Bump active_record_query_trace from 1.5.4 to 1.6 (#10192 ) Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace) from 1.5.4 to 1.6. - [Release notes](https://github.com/brunofacca/active-record-query-trace/releases) - [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/v1.6/HISTORY.md) - [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.5.4...v1.6) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-03-06 14:58:13 +09:00
Thibaut Girka	2267eee356	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-28 21:35:53 +01:00
dependabot[bot]	34315fcda5	Bump capybara from 3.13.2 to 3.14.0 (#10119 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.13.2 to 3.14.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.13.2...3.14.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-02-27 15:02:57 +01:00
Thibaut Girka	0158937fc2	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - Dockerfile Took upstream version and reverted `f13ebd02c9`. Hopefuly it's not needed anymore. - app/controllers/api/v1/search_controller.rb The conflict was due to us raising the number of results returned. Upstream raised it further, so took it. - config/locales/de.yml Took upstream changes to theme translation strings. - config/locales/gl.yml Took upstream changes to theme translation strings. - config/locales/nl.yml Took upstream changes to theme translation strings. - config/locales/sk.yml Took upstream changes to theme translation strings.	2019-02-26 17:04:44 +01:00
dependabot[bot]	775e835ed6	Bump rubocop from 0.64.0 to 0.65.0 (#10112 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.64.0 to 0.65.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.64.0...v0.65.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-02-25 15:56:35 +01:00
dependabot[bot]	c07e59031f	Bump dotenv-rails from 2.6.0 to 2.7.1 (#10114 ) Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.6.0 to 2.7.1. - [Release notes](https://github.com/bkeepers/dotenv/releases) - [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md) - [Commits](https://github.com/bkeepers/dotenv/compare/v2.6.0...v2.7.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-02-25 15:55:53 +01:00
dependabot[bot]	4532833498	Bump pry-byebug from 3.6.0 to 3.7.0 (#10098 ) Bumps [pry-byebug](https://github.com/deivid-rodriguez/pry-byebug) from 3.6.0 to 3.7.0. - [Release notes](https://github.com/deivid-rodriguez/pry-byebug/releases) - [Changelog](https://github.com/deivid-rodriguez/pry-byebug/blob/master/CHANGELOG.md) - [Commits](https://github.com/deivid-rodriguez/pry-byebug/compare/v3.6.0...v3.7.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-02-22 20:06:01 +09:00
Thibaut Girka	06cc04fd23	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-15 18:02:45 +01:00
dependabot[bot]	3d374ed18b	Bump bootsnap from 1.3.2 to 1.4.0 (#10022 ) Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.3.2 to 1.4.0. - [Release notes](https://github.com/Shopify/bootsnap/releases) - [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.3.2...v1.4.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-02-13 02:55:06 +01:00
Thibaut Girka	0e34e91661	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-12 20:32:48 +01:00
dependabot[bot]	241661e009	Bump rubocop from 0.63.1 to 0.64.0 (#10006 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.63.1 to 0.64.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.63.1...v0.64.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-02-12 05:11:06 +01:00
Thibaut Girka	bf94a43496	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default.	2019-02-10 21:10:09 +01:00
dependabot[bot]	3031b8a8f2	Bump parallel_tests from 2.27.1 to 2.28.0 (#9985 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.27.1 to 2.28.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.27.1...v2.28.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-02-10 18:17:34 +01:00
dependabot[bot]	e28fe2ef26	Bump microformats from 4.0.7 to 4.1.0 (#9980 ) Bumps [microformats](https://github.com/microformats/microformats-ruby) from 4.0.7 to 4.1.0. - [Release notes](https://github.com/microformats/microformats-ruby/releases) - [Commits](https://github.com/microformats/microformats-ruby/compare/v4.0.7...v4.1.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-02-06 16:46:37 +01:00
dependabot[bot]	c5071f2d78	Bump capybara from 3.12.0 to 3.13.2 (#9935 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.12.0 to 3.13.2. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.12.0...3.13.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-02-03 03:40:40 +01:00
Thibaut Girka	04e2c67389	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-25 11:37:49 +01:00
dependabot[bot]	c30287cf7c	Bump addressable from 2.5.2 to 2.6.0 (#9888 ) Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.5.2 to 2.6.0. - [Release notes](https://github.com/sporkmonger/addressable/releases) - [Changelog](https://github.com/sporkmonger/addressable/blob/master/CHANGELOG.md) - [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.5.2...addressable-2.6.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-01-21 21:38:00 +09:00
Thibaut Girka	5e0cf92fd1	Merge branch 'master' into glitch-soc/merge-upstream No conflicts.	2019-01-19 18:28:37 +01:00
dependabot[bot]	bf31f394fb	Bump json-ld from 2.2.1 to 3.0.2 (#8804 ) Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 2.2.1 to 3.0.2. - [Release notes](https://github.com/ruby-rdf/json-ld/releases) - [Commits](https://github.com/ruby-rdf/json-ld/compare/2.2.1...3.0.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-01-18 16:02:29 +01:00
dependabot[bot]	f424e99e46	Bump brakeman from 4.3.1 to 4.4.0 (#9848 ) Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.3.1 to 4.4.0. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v4.3.1...v4.4.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-01-18 15:57:41 +01:00
dependabot[bot]	451ae6896d	Bump rubocop from 0.62.0 to 0.63.0 (#9827 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.62.0 to 0.63.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.62.0...v0.63.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-01-17 22:21:32 +09:00
Thibaut Girka	dbe311f0e9	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - config/locales/simple_form.pl.yml	2019-01-16 14:20:07 +01:00
Eugen Rochko	ee5e24807f	Add `tootctl domains crawl` (#9809 )	2019-01-15 09:24:35 +01:00
dependabot[bot]	5ac425ad28	Bump sidekiq-unique-jobs from 5.0.10 to 6.0.8 (#9801 ) Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 5.0.10 to 6.0.8. - [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases) - [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md) - [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v5.0.10...v6.0.8) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-01-14 09:18:55 +00:00
dependabot[bot]	944de8a6c9	Bump dotenv-rails from 2.5.0 to 2.6.0 (#9803 ) Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.5.0 to 2.6.0. - [Release notes](https://github.com/bkeepers/dotenv/releases) - [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md) - [Commits](https://github.com/bkeepers/dotenv/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-01-14 09:13:34 +00:00
Thibaut Girka	a2a64ecd3e	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.	2019-01-10 21:00:30 +01:00
dependabot[bot]	b418ef5ba8	Bump nokogiri from 1.9.1 to 1.10.0 (#9757 ) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.9.1 to 1.10.0. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.9.1...v1.10.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-01-08 14:10:30 +01:00
dependabot[bot]	1c23124ba4	Bump rubocop from 0.61.1 to 0.62.0 (#9702 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.61.1 to 0.62.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.61.1...v0.62.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-01-03 08:22:01 +01:00
dependabot[bot]	dd43cbdf25	Bump httplog from 1.1.1 to 1.2.0 (#9681 ) Bumps [httplog](https://github.com/trusche/httplog) from 1.1.1 to 1.2.0. - [Release notes](https://github.com/trusche/httplog/releases) - [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md) - [Commits](https://github.com/trusche/httplog/compare/v1.1.1...v1.2.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2019-01-02 22:39:02 +01:00
Thibaut Girka	571d219bb9	Merge branch 'master' into glitch-soc/merge-upstream Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock	2019-01-02 15:36:53 +01:00
ashleyhull-versent	29484f6555	Replace Ruby 2.3 with 2.6 in CircleCI (#9652 ) * Update config.yml * Update Gemfile * dropping ruby 2.3 2.3 EOL date: scheduled for 2019-03-31 * Updating docker containers * Update Gemfile	2018-12-29 07:23:07 +01:00
dependabot[bot]	17cd443b37	Bump webmock from 3.4.2 to 3.5.1 (#9641 ) Bumps [webmock](https://github.com/bblimke/webmock) from 3.4.2 to 3.5.1. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.4.2...v3.5.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-27 12:23:27 +01:00
dependabot[bot]	8be0843467	Bump cld3 from 3.2.2 to 3.2.3 (#9632 ) Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.2.2 to 3.2.3. - [Release notes](https://github.com/akihikodaki/cld3-ruby/releases) - [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.2...v3.2.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-26 06:39:17 +01:00
Thibaut Girka	034ffc079e	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.	2018-12-18 16:55:15 +01:00
dependabot[bot]	071eb0e202	Bump nokogiri from 1.8.5 to 1.9.1 (#9557 ) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.5 to 1.9.1. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.8.5...v1.9.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-18 16:41:41 +01:00
dependabot[bot]	bfd0ebf925	Bump omniauth from 1.8.1 to 1.9.0 (#9544 ) Bumps [omniauth](https://github.com/omniauth/omniauth) from 1.8.1 to 1.9.0. - [Release notes](https://github.com/omniauth/omniauth/releases) - [Commits](https://github.com/omniauth/omniauth/compare/v1.8.1...v1.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-17 10:15:14 +01:00
Thibaut Girka	65e994b29b	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.	2018-12-15 10:45:53 +01:00
dependabot[bot]	fcc35f6ec1	Bump aws-sdk-s3 from 1.27.0 to 1.30.0 (#9429 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.27.0 to 1.30.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-14 20:37:29 +01:00
dependabot[bot]	7241db299c	Bump redis from 4.0.3 to 4.1.0 (#9520 ) Bumps [redis](https://github.com/redis/redis-rb) from 4.0.3 to 4.1.0. - [Release notes](https://github.com/redis/redis-rb/releases) - [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md) - [Commits](https://github.com/redis/redis-rb/compare/v4.0.3...v4.1.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-14 06:52:06 +01:00
dependabot[bot]	a48fe52375	Bump letter_opener from 1.6.0 to 1.7.0 (#9493 ) Bumps [letter_opener](https://github.com/ryanb/letter_opener) from 1.6.0 to 1.7.0. - [Release notes](https://github.com/ryanb/letter_opener/releases) - [Changelog](https://github.com/ryanb/letter_opener/blob/master/CHANGELOG.md) - [Commits](https://github.com/ryanb/letter_opener/compare/v1.6.0...v1.7.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-11 14:34:02 +09:00
dependabot[bot]	f1041637ff	Bump json-ld-preloaded from 2.2.3 to 3.0.0 (#9416 ) Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 2.2.3 to 3.0.0. - [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases) - [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/2.2.3...3.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-11 05:40:01 +01:00
Thibaut Girka	1df392819d	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-06 12:44:38 +01:00
dependabot[bot]	d5245434ec	Bump rails from 5.2.1.1 to 5.2.2 (#9430 ) Bumps [rails](https://github.com/rails/rails) from 5.2.1.1 to 5.2.2. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.1.1...v5.2.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-06 16:10:18 +09:00
dependabot[bot]	c73c463478	Bump rubocop from 0.60.0 to 0.61.0 (#9439 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.60.0 to 0.61.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.60.0...v0.61.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-06 16:08:54 +09:00
dependabot[bot]	a61ce1c947	Bump capybara from 3.11.1 to 3.12.0 (#9388 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.11.1 to 3.12.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.11.1...3.12.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-12-04 09:27:17 +09:00
Thibaut Girka	d32d33f408	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-02 20:29:14 +01:00
ThibG	84e5ed43e7	Preload common JSON-LD contexts (#9412 ) Fixes #9411	2018-12-02 16:46:13 +01:00
Thibaut Girka	ad7a3974cc	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-29 19:22:52 +01:00
dependabot[bot]	6fac300ea4	Bump aws-sdk-s3 from 1.25.0 to 1.27.0 (#9385 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.25.0 to 1.27.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-28 16:34:53 +01:00
Thibaut Girka	f8e07ca5cd	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).	2018-11-27 13:23:02 +01:00
dependabot[bot]	d5fac45f5b	Bump tty-prompt from 0.17.2 to 0.18.0 (#9354 ) Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.17.2 to 0.18.0. - [Release notes](https://github.com/piotrmurach/tty-prompt/releases) - [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md) - [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.17.2...v0.18.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-27 12:27:00 +01:00
dependabot[bot]	0206d569c3	Bump simple_form from 4.0.1 to 4.1.0 (#9331 ) Bumps [simple_form](https://github.com/plataformatec/simple_form) from 4.0.1 to 4.1.0. - [Release notes](https://github.com/plataformatec/simple_form/releases) - [Changelog](https://github.com/plataformatec/simple_form/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/simple_form/compare/v4.0.1...v4.1.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-23 14:29:59 +09:00
dependabot[bot]	473998ca27	Bump sidekiq-bulk from 0.1.1 to 0.2.0 (#9306 ) Bumps [sidekiq-bulk](https://github.com/aprescott/sidekiq-bulk) from 0.1.1 to 0.2.0. - [Release notes](https://github.com/aprescott/sidekiq-bulk/releases) - [Changelog](https://github.com/aprescott/sidekiq-bulk/blob/master/CHANGES.md) - [Commits](https://github.com/aprescott/sidekiq-bulk/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-22 12:47:36 +01:00
dependabot[bot]	c100e82a56	Bump aws-sdk-s3 from 1.24.0 to 1.25.0 (#9321 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.24.0 to 1.25.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-22 12:47:14 +01:00
dependabot[bot]	367ad21995	Bump aws-sdk-s3 from 1.23.1 to 1.24.0 (#9289 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.23.1 to 1.24.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-16 11:19:09 +01:00
dependabot[bot]	96165a29ba	Bump capybara from 3.10.1 to 3.11.0 (#9285 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.10.1 to 3.11.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.10.1...3.11.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-15 14:49:06 +09:00
Thibaut Girka	bfe2b9cc50	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-13 16:28:07 +01:00
dependabot[bot]	c81bdafb07	Bump parallel_tests from 2.26.2 to 2.27.0 (#9263 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.26.2 to 2.27.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.26.2...v2.27.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-12 12:50:48 +01:00
dependabot[bot]	fe57d73e4c	Bump bullet from 5.8.1 to 5.9.0 (#9264 ) Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.8.1 to 5.9.0. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/5.8.1...5.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-12 12:49:51 +01:00
Thibaut Girka	9201398507	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-09 14:56:31 +01:00
dependabot[bot]	f055907857	Bump bullet from 5.7.6 to 5.8.1 (#9156 ) Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.7.6 to 5.8.1. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/5.7.6...5.8.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-11-08 21:15:33 +01:00
Thibaut Girka	94ad76a5b9	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-30 11:22:25 +01:00
dependabot[bot]	6771e8c88c	Bump oj from 3.6.12 to 3.7.0 (#9155 ) Bumps [oj](https://github.com/ohler55/oj) from 3.6.12 to 3.7.0. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.6.12...v3.7.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-30 06:39:52 +01:00
Eugen Rochko	d4415cc316	Bump i18n-tasks from master to 0.9.28 (#9148 )	2018-10-30 01:06:47 +01:00
Thibaut Girka	f16d66c5c8	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-29 14:09:54 +01:00
Eugen Rochko	b40ea6d1d4	Bump sanitize from 4.6.6 to 5.0.0 (#9140 )	2018-10-29 14:05:25 +01:00
Thibaut Girka	a942ad3062	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - config/locales/simple_form.ja.yml Not a real conflict, one new string was introduced in glitch and one in upstream.	2018-10-29 14:00:41 +01:00
Eugen Rochko	32f950a7a8	Update i18n-tasks to master (#9139 )	2018-10-29 13:46:39 +01:00
dependabot[bot]	ce33ce94c9	Bump parallel_tests from 2.25.0 to 2.26.0 (#9137 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.25.0 to 2.26.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.25.0...v2.26.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-29 12:55:55 +01:00
dependabot[bot]	3b89abc343	Bump rubocop from 0.59.2 to 0.60.0 (#9135 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.59.2 to 0.60.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.59.2...v0.60.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-29 12:55:16 +01:00
Thibaut Girka	b00f60f1d3	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-28 08:37:49 +01:00
Eugen Rochko	26fe37c414	Update i18n-tasks and change CircleCI command (#9104 ) * Update i18n-tasks and CircleCI command * Fix #9088 * Update i18n-tasks * Fix ast	2018-10-28 07:15:20 +01:00
Thibaut Girka	5bb8563f6c	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.	2018-10-26 20:41:43 +02:00
dependabot[bot]	98b4cdf198	Bump parallel_tests from 2.24.0 to 2.25.0 (#9090 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.24.0 to 2.25.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.24.0...v2.25.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-25 08:29:25 +02:00
dependabot[bot]	4e6cffe00c	Bump aws-sdk-s3 from 1.21.0 to 1.23.0 (#9089 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.21.0 to 1.23.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-25 08:29:12 +02:00
Eugen Rochko	df3a7e724d	Fix missing plural keys (#9084 ) * Update i18n-tasks to feature-missing-plural-keys * Fix pluralizations with missing keys in Arabic Fix #8554 * Add i18n-tasks missing-plural-keys to CircleCI	2018-10-25 00:09:45 +02:00
dependabot[bot]	9f3283086f	Bump capybara from 3.9.0 to 3.10.0 (#9077 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.9.0 to 3.10.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.9.0...3.10.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-24 23:22:18 +09:00
Thibaut Girka	8f3096b846	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-23 17:15:57 +02:00
dependabot[bot]	65867b6e61	Bump parallel_tests from 2.23.0 to 2.24.0 (#9064 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.23.0 to 2.24.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.23.0...v2.24.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-23 08:17:26 +02:00
Thibaut Girka	dcded13a99	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.	2018-10-22 17:51:38 +02:00
Eugen Rochko	4f0bdbaaaf	Downgrade fog-openstack to 0.3.7 and fog-core to 2.1.0 (#9049 ) Fix #8889	2018-10-22 16:58:36 +02:00
dependabot[bot]	8b0a980e28	Bump strong_migrations from 0.2.3 to 0.3.0 (#8991 ) Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.2.3 to 0.3.0. - [Release notes](https://github.com/ankane/strong_migrations/releases) - [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/strong_migrations/compare/v0.2.3...v0.3.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-16 07:50:09 +02:00
dependabot[bot]	734d55c3cf	Bump pundit from 1.1.0 to 2.0.0 (#8873 ) Bumps [pundit](https://github.com/varvet/pundit) from 1.1.0 to 2.0.0. - [Release notes](https://github.com/varvet/pundit/releases) - [Changelog](https://github.com/varvet/pundit/blob/master/CHANGELOG.md) - [Commits](https://github.com/varvet/pundit/compare/v1.1.0...v2.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-12 22:48:16 +02:00
Thibaut Girka	8f720be9f3	Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream	2018-10-11 14:12:36 +02:00
dependabot[bot]	ac7df62a04	Bump better_errors from 2.4.0 to 2.5.0 (#8946 ) Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.4.0 to 2.5.0. - [Release notes](https://github.com/BetterErrors/better_errors/releases) - [Changelog](https://github.com/BetterErrors/better_errors/blob/master/CHANGELOG.md) - [Commits](https://github.com/BetterErrors/better_errors/compare/v2.4.0...v2.5.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-10 19:36:41 +02:00
Thibaut Girka	a02244f17c	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/javascript/packs/public.js Changes made to app/javascript/packs/publics.js were applied to app/javascript/core/settings.js	2018-10-09 21:08:26 +02:00
dependabot[bot]	46e4a759bb	Bump capistrano-rails from 1.3.1 to 1.4.0 (#8936 ) Bumps [capistrano-rails](https://github.com/capistrano/rails) from 1.3.1 to 1.4.0. - [Release notes](https://github.com/capistrano/rails/releases) - [Changelog](https://github.com/capistrano/rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/capistrano/rails/compare/v1.3.1...v1.4.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-09 19:43:26 +02:00
dependabot[bot]	076ceffa84	Bump dotenv-rails from 2.2.2 to 2.5.0 (#8934 ) Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.2.2 to 2.5.0. - [Release notes](https://github.com/bkeepers/dotenv/releases) - [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md) - [Commits](https://github.com/bkeepers/dotenv/compare/v2.2.2...v2.5.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-09 19:43:05 +02:00
dependabot[bot]	d4b7d75968	Bump faker from 1.8.7 to 1.9.1 (#8935 ) Bumps [faker](https://github.com/stympy/faker) from 1.8.7 to 1.9.1. - [Release notes](https://github.com/stympy/faker/releases) - [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/stympy/faker/compare/v1.8.7...v1.9.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-09 19:59:34 +09:00
Thibaut Girka	d17844e6d1	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 13:51:33 +02:00
dependabot[bot]	4c4ff05a46	Bump capybara from 3.8.2 to 3.9.0 (#8924 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.8.2 to 3.9.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.8.2...3.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-08 07:45:31 +02:00
dependabot[bot]	10e38b441f	Bump aws-sdk-s3 from 1.20.0 to 1.21.0 (#8926 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.20.0 to 1.21.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-08 07:44:53 +02:00
Thibaut Girka	611740ce81	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-07 19:47:56 +02:00
Eugen Rochko	30dd7f3d90	Remove unused ruby-progressbar dependency (#8896 ) * Remove unused ruby-progressbar dependency * Remove unused colorize dependency	2018-10-06 08:33:26 +09:00
Thibaut Girka	98bb6815a7	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-05 21:48:25 +02:00
dependabot[bot]	6812f811b1	Bump parallel_tests from 2.21.3 to 2.23.0 (#8884 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.21.3 to 2.23.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.21.3...v2.23.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-05 18:59:35 +02:00
dependabot[bot]	7c154c6afd	Bump puma from 3.11.4 to 3.12.0 (#8883 ) Bumps [puma](https://github.com/puma/puma) from 3.11.4 to 3.12.0. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v3.11.4...v3.12.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-05 18:58:13 +02:00
Thibaut Girka	00fcdebed7	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.	2018-10-05 15:23:57 +02:00
dependabot[bot]	da8abef56d	Bump fog-openstack, rspec-rails and fog-core (#8877 ) Bumps [fog-openstack](https://github.com/fog/fog-openstack), [rspec-rails](https://github.com/rspec/rspec-rails) and [fog-core](https://github.com/fog/fog-core). These dependencies needed to be updated together. Updates `fog-openstack` from 0.3.6 to 1.0.3 - [Release notes](https://github.com/fog/fog-openstack/releases) - [Changelog](https://github.com/fog/fog-openstack/blob/master/CHANGELOG.md) - [Commits](https://github.com/fog/fog-openstack/compare/v0.3.6...v1.0.3) Updates `rspec-rails` from 3.7.2 to 3.8.0 - [Release notes](https://github.com/rspec/rspec-rails/releases) - [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v3.7.2...v3.8.0) Updates `fog-core` from 1.45.0 to 2.1.2 - [Release notes](https://github.com/fog/fog-core/releases) - [Changelog](https://github.com/fog/fog-core/blob/master/changelog.md) - [Commits](https://github.com/fog/fog-core/compare/v1.45.0...v2.1.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-04 15:35:18 +02:00
dependabot[bot]	928102284a	Bump webmock from 3.3.0 to 3.4.2 (#8874 ) Bumps [webmock](https://github.com/bblimke/webmock) from 3.3.0 to 3.4.2. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.3.0...v3.4.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-04 12:34:17 +02:00
dependabot[bot]	10f7916f37	Bump fuubar from 2.3.1 to 2.3.2 (#8875 ) Bumps [fuubar](https://github.com/thekompanee/fuubar) from 2.3.1 to 2.3.2. - [Release notes](https://github.com/thekompanee/fuubar/releases) - [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md) - [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.3.1...releases/v2.3.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-04 12:33:02 +02:00
dependabot[bot]	b70de2cf69	Bump http from 3.2.0 to 3.3.0 (#8871 ) Bumps [http](https://github.com/httprb/http) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/httprb/http/releases) - [Changelog](https://github.com/httprb/http/blob/master/CHANGES.md) - [Commits](https://github.com/httprb/http/compare/v3.2.0...v3.3.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-04 12:32:26 +02:00
dependabot[bot]	ebb3631216	Bump brakeman from 4.2.1 to 4.3.1 (#8872 ) Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.2.1 to 4.3.1. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v4.2.1...v4.3.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-04 12:31:22 +02:00
dependabot[bot]	ad459ab837	Bump fog-openstack from 0.1.25 to 0.3.6 (#8860 ) Bumps [fog-openstack](https://github.com/fog/fog-openstack) from 0.1.25 to 0.3.6. - [Release notes](https://github.com/fog/fog-openstack/releases) - [Changelog](https://github.com/fog/fog-openstack/blob/master/CHANGELOG.md) - [Commits](https://github.com/fog/fog-openstack/compare/v0.1.25...v0.3.6) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-04 01:07:13 +02:00
dependabot[bot]	941c9d0d42	Bump aws-sdk-s3 from 1.9.1 to 1.20.0 (#8848 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.9.1 to 1.20.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-04 01:06:54 +02:00
dependabot[bot]	3b6ab82db7	Bump capybara from 2.18.0 to 3.8.2 (#8858 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 2.18.0 to 3.8.2. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/2.18.0...3.8.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-03 15:24:48 +02:00
dependabot[bot]	730f196b96	Bump pg from 1.0.0 to 1.1.3 (#8856 ) Bumps [pg](https://bitbucket.org/ged/ruby-pg) from 1.0.0 to 1.1.3. - [Changelog](https://bitbucket.org/ged/ruby-pg/src/master/History.rdoc) - [Commits](https://bitbucket.org/ged/ruby-pg/branches/compare/v1.1.3..v1.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-03 15:20:56 +02:00
dependabot[bot]	53275b949e	Bump httplog from 1.0.2 to 1.1.1 (#8839 ) Bumps [httplog](https://github.com/trusche/httplog) from 1.0.2 to 1.1.1. - [Release notes](https://github.com/trusche/httplog/releases) - [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md) - [Commits](https://github.com/trusche/httplog/compare/v1.0.2...v1.1.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-03 04:56:00 +02:00
dependabot[bot]	3f62b119e4	Bump rubocop from 0.55.0 to 0.59.2 (#8849 ) Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.55.0 to 0.59.2. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.55.0...v0.59.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-02 20:16:51 +02:00
dependabot[bot]	194ad2c90b	Bump rack-attack from 5.2.0 to 5.4.1 (#8838 ) Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 5.2.0 to 5.4.1. - [Release notes](https://github.com/kickstarter/rack-attack/releases) - [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md) - [Commits](https://github.com/kickstarter/rack-attack/compare/v5.2.0...v5.4.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-01 22:49:26 +02:00
Grey Baker	3a2f007eb0	Promote colorize to top-level dependency (#8844 )	2018-10-02 05:34:25 +09:00
Thibaut Girka	24d05c7a50	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-01 14:36:06 +02:00
dependabot[bot]	746da5ccda	Bump ox from 2.9.2 to 2.10.0 (#8837 ) Bumps [ox](https://github.com/ohler55/ox) from 2.9.2 to 2.10.0. - [Release notes](https://github.com/ohler55/ox/releases) - [Changelog](https://github.com/ohler55/ox/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/ox/compare/v2.9.2...v2.10.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-10-01 14:08:33 +02:00
Thibaut Girka	c91d9b7389	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb	2018-10-01 12:43:20 +02:00
Eugen Rochko	e09301f414	Adjust bootsnap configuration for newer version (#8826 )	2018-09-29 18:34:36 +02:00
dependabot[bot]	5da51771cd	Bump oj from 3.5.1 to 3.6.11 (#8815 ) Bumps [oj](https://github.com/ohler55/oj) from 3.5.1 to 3.6.11. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.5.1...v3.6.11) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-09-28 13:34:31 +02:00
dependabot[bot]	e046a987f6	Bump capistrano from 3.10.2 to 3.11.0 (#8801 ) Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.10.2 to 3.11.0. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Changelog](https://github.com/capistrano/capistrano/blob/master/CHANGELOG.md) - [Commits](https://github.com/capistrano/capistrano/compare/v3.10.2...v3.11.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-09-27 18:24:06 +02:00
dependabot[bot]	7efa3d02c7	Bump sidekiq-scheduler from 2.2.1 to 3.0.0 (#8789 ) Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler) from 2.2.1 to 3.0.0. - [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases) - [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v2.2.1...v3.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-09-27 02:11:21 +09:00
dependabot[bot]	65e7c6d9b5	Bump tty-prompt from 0.16.0 to 0.17.0 (#8791 ) Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.16.0 to 0.17.0. - [Release notes](https://github.com/piotrmurach/tty-prompt/releases) - [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md) - [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.16.0...v0.17.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-09-27 02:02:38 +09:00
Grey Baker	6e075b9cc4	Bump devise from 4.4.3 to 4.5.0 (#8778 ) Bumps [devise](https://github.com/plataformatec/devise) from 4.4.3 to 4.5.0. - [Release notes](https://github.com/plataformatec/devise/releases) - [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/devise/compare/v4.4.3...v4.5.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-09-26 04:27:53 +09:00
dependabot[bot]	8096df1055	Bump sidekiq from 5.1.3 to 5.2.2 (#8779 ) Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.1.3 to 5.2.2. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md) - [Commits](https://github.com/mperham/sidekiq/compare/v5.1.3...v5.2.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-09-25 20:33:00 +02:00
dependabot[bot]	29e2d9e1b7	Bump mime-types from 3.1 to 3.2.2 (#8781 ) Bumps [mime-types](https://github.com/mime-types/ruby-mime-types) from 3.1 to 3.2.2. - [Release notes](https://github.com/mime-types/ruby-mime-types/releases) - [Changelog](https://github.com/mime-types/ruby-mime-types/blob/master/History.md) - [Commits](https://github.com/mime-types/ruby-mime-types/compare/v3.1...v3.2.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-09-25 20:32:37 +02:00
dependabot[bot]	a7f75485d1	Bump pghero from 2.1.0 to 2.2.0 (#8782 ) Bumps [pghero](https://github.com/ankane/pghero) from 2.1.0 to 2.2.0. - [Release notes](https://github.com/ankane/pghero/releases) - [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/pghero/compare/v2.1.0...v2.2.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-09-25 20:31:40 +02:00
Eugen Rochko	56efc28189	Update ruby dependencies (#8743 ) * Update ffi to 1.9.25 * Update private_address_check to 0.5.0	2018-09-21 00:42:59 +02:00
Thibaut Girka	91bef4759f	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js	2018-09-19 21:46:01 +02:00
Yamagishi Kazutoshi	0ddbccf7e6	Upgrade Babel to version 7.0.0 (#5925 )	2018-09-14 17:59:48 +02:00
Alexander	64a5561b5a	update devise_pam_authenticatable2, new feature: pam gets ip address of client (#8623 )	2018-09-14 17:42:45 +02:00
Thibaut Girka	53b7bb9d04	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml	2018-08-27 18:09:28 +02:00
Eugen Rochko	c597249124	Add thor to Gemfile directly (#8467 ) It's a common dependency, but just in case	2018-08-26 20:02:32 +02:00
Thibaut Girka	36393e1d2b	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.	2018-08-26 14:23:24 +02:00
Eugen Rochko	b37ae64578	Upgrade Doorkeeper to 5.0.0 (#8409 ) See doorkeeper-gem/doorkeeper#1137	2018-08-24 18:17:11 +02:00
Thibaut Girka	8b4abaa90d	Merge branch 'master' into glitch-soc/master Conflicts: config/routes.rb Added the “endorsements” route from upstream.	2018-08-21 18:24:48 +02:00
ThibG	f06fa09962	Revert to using Paperclip's filesystem storage, and fix dangling records in remove_remote (#8339 ) * Fix uncaching worker * Revert to using Paperclip's filesystem backend instead of fog-local fog-local has lots of concurrency issues, causing failure to delete files, dangling file records, and spurious errors UncacheMediaWorker	2018-08-21 17:53:01 +02:00
ThibG	8ac5e651e1	Upgrade doorkeeper to 4.4.2 (#8321 )	2018-08-20 22:42:02 +02:00
Thibaut Girka	88a0395a58	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-19 09:27:18 +02:00
AkiraFukushima	58ffe3f7c3	Revert "Upgrade Doorkeeper to 4.4.1 (#8197 )" (#8231 ) * Revert "Upgrade Doorkeeper to 4.4.1 (#8197)" This reverts commit `464daffdf9`. * Except migration files from revert commit	2018-08-19 03:20:37 +02:00
Eugen Rochko	c6eab9e0aa	Add Makara dependency to support read-replicas (#8216 ) Not active by default unless config/database.yml is edited	2018-08-18 21:06:12 +02:00
Eugen Rochko	464daffdf9	Upgrade Doorkeeper to 4.4.1 (#8197 )	2018-08-14 20:24:47 +02:00
S.H	5f41bbd274	Update Rails (#8141 ) * Update Rails * fix Update Rails	2018-08-13 18:17:20 +02:00
S.H	2aeeffc3ec	Update Rails (#8141 ) * Update Rails * fix Update Rails	2018-08-12 12:25:23 +02:00
Thibaut Girka	db200226b8	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…	2018-06-15 20:51:39 +02:00
Eugen Rochko	53f0452b70	Remove rack-timeout (#7809 ) Timeout considered harmful due to leaving the app in a broken state, including unreaped database connections	2018-06-15 19:46:25 +02:00
Thibaut Girka	b481e4fac1	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: config/locales/simple_form.ja.yml	2018-05-19 22:41:10 +02:00
MIYAGI Hikaru	0b1f88cfd5	Upgrade posix-spawn to master (#7542 )	2018-05-19 02:20:43 +02:00
Thibaut Girka	78ac246b87	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: Gemfile Solved conflicts by using upstream's line for posix-spawn	2018-05-16 21:52:38 +02:00
MIYAGI Hikaru	6bed372ad2	Fix posix-spawn to version 0.3.12 (#7517 ) Because 0.3.13 causes build error in x86 or other ILP32 environments. closes #7453	2018-05-16 16:52:19 +02:00
Thibaut Girka	ba7ee67498	Merge branch 'master' into glitch-soc/merge	2018-05-14 20:51:50 +02:00
Yamagishi Kazutoshi	f77b11cd10	Update http_parser.rb to head version (#7467 )	2018-05-13 11:32:46 +02:00
Yamagishi Kazutoshi	4d706f9976	Downgrade doorkeeper to version 4.2.6 (#7456 ) ref https://github.com/doorkeeper-gem/doorkeeper/pull/1060	2018-05-12 12:08:12 +02:00
Thibaut Girka	1c9c0167b7	Merge branch 'master' into glitch-soc/master Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	2018-05-10 00:03:28 +02:00
Yamagishi Kazutoshi	8c35d163a5	Port travis_retry for CI (#7379 ) * Port travis_retry for CI * Add license	2018-05-06 10:55:50 +02:00
David Yip	54e80bec73	Remove duplicate posix-spawn entry from Gemfile.	2018-05-04 10:11:45 -05:00
David Yip	e41332c37b	Make posix-spawn spec in Gemfile match what's in Gemfile.lock.	2018-05-04 09:51:18 -05:00
David Yip	77a92d3260	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: Gemfile.lock	2018-05-04 09:42:31 -05:00
Eugen Rochko	a78b27c7cc	Marginally improve convert/ffmpeg calls performance with posix-spawn (#7346 )	2018-05-04 13:22:23 +02:00
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	2018-05-03 17:23:44 -05:00
Shuhei Kitagawa	ab773e4d5f	Add pry-byebug (#7307 )	2018-05-03 12:08:54 +02:00
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	2018-05-02 18:58:48 +02:00
Yamagishi Kazutoshi	9613a53cb3	Update dependencies for Ruby (2018-04-23) (#7237 ) * Update annotate to version 2.7.3 * Update aws-sdk-s3 to version 1.9.2 * Update browser to version 2.5.3 * Update capistrano to version 3.10.2 * Update domain_name to version 0.5.20180417 * Update http to version 3.2.0 * Update lograge to version 0.10.0 * Update oj to version 3.5.1 * Update parallel_tests to version 2.21.3 * Update puma to version 3.11.4 * Update rubocop to version 0.55.0 * Update scss_lint to version 0.57.0 * Update simplecov to version 0.16.1 * Update tty-command to version 0.8.0 * Update tty-prompt to version 0.16.0 * Update pkg-config to version 1.3.0 * Update fog-local to version 0.5.0 * Update fog-openstack to version 0.1.25 * Update devise-two-factor to version 3.0.3 * bundle update	2018-04-23 11:29:17 +02:00
Yamagishi Kazutoshi	b438224751	Introduce rspec-retry (#7206 )	2018-04-20 19:31:30 +02:00
David Yip	ed490b781f	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: Gemfile.lock config/application.rb	2018-04-13 16:36:46 -05:00
Yamagishi Kazutoshi	50529cbceb	Upgrade Rails to version 5.2.0 (#5898 )	2018-04-12 14:45:17 +02:00
David Yip	a817f084ea	Merge remote-tracking branch 'tootsuite/master' Conflicts: app/controllers/statuses_controller.rb	2018-04-12 03:30:57 -05:00
Alexander	8e88a18316	update gem, test pam authentication (#7028 ) * update gem, test pam authentication * add description for test parameters * fix inclusion of optional group	2018-04-11 21:40:38 +02:00
David Yip	67e77f230e	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: app/serializers/initial_state_serializer.rb The glitch flavour isn't yet pulling custom emoji data on its own (see https://github.com/tootsuite/mastodon/pull/7047). Once that gets into the glitch flavour, we can eliminate the custom_emojis load.	2018-04-08 19:05:02 -05:00
Eugen Rochko	d4de2239b0	Add a circuit breaker for ActivityPub deliveries (#7053 )	2018-04-07 21:36:58 +02:00
Jenkins	f0bb3ff533	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-30 19:17:17 +00:00
Pierre-Morgan Gate	47cee7cc8e	Upgrade charlock_holmes to version 0.7.6 (#6966 ) This version fixes compilation errors when trying to build its native extension with ICU 61.	2018-03-30 09:52:44 +02:00
Jenkins	837b3804bf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-25 15:17:21 +00:00
Yamagishi Kazutoshi	28384c1771	Revert "Revert "Upgrade Paperclip to version 6.0.0" (#6807 )" (#6808 ) This reverts commit `40871caa4b`.	2018-03-24 12:52:45 +01:00
Jenkins	6290cd7969	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-21 17:17:20 +00:00
Patrick Figel	d97903a358	Update sanitize and loofah (#6855 ) Fixes CVE-2018-8048 and CVE-2018-3740, two medium-severity XSS vulnerabilities present in these gems when built against libxml2 >= 2.9.2.	2018-03-21 17:43:28 +01:00
Jenkins	df70571bfe	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-19 20:17:18 +00:00
Alexander	0306e3e9be	bugfixes and gem update (#6831 ) * update to new version of devise_pam_authenticatable2 * fix behaviour if suffix is nil, fix environment loading, fix user email creation * code cleanup/fix linter warning	2018-03-19 20:08:56 +01:00
Eugen Rochko	40871caa4b	Revert "Upgrade Paperclip to version 6.0.0" (#6807 ) * Revert "Bump version to 2.3.2rc1" This reverts commit `cdf8b92fea`. * Revert "Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 (#6806)" This reverts commit `0074cad44f`. * Revert "Handle Mastodon::HostValidationError when pulling remoteable assets (#6782)" This reverts commit `4a0a19fe54`. * Revert "Correct the reference to user's password in mastodon:add_user task (#6800)" This reverts commit `338bff8b93`. * Revert "Upgrade Paperclip to version 6.0.0 (#6754)" This reverts commit `b88fcd53f7`.	2018-03-17 14:20:35 +01:00
Yamagishi Kazutoshi	b88fcd53f7	Upgrade Paperclip to version 6.0.0 (#6754 )	2018-03-17 12:37:58 +01:00
Jenkins	447d7e6127	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-09 00:17:17 +00:00
Eugen Rochko	4847149b6e	Always install LDAP, CAS and SAML gems, because they don't require deps (#6663 ) Fix #6534 PAM requires a system dependency so...	2018-03-07 02:25:17 +01:00
Yamagishi Kazutoshi	e9e475a29d	Upgrade chewy to version 5.0.0 (#6649 )	2018-03-06 06:14:26 +01:00
David Yip	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	2018-03-02 21:46:44 -06:00
Patrick Figel	e4db0f28d2	Update omniauth-saml to 1.10 (#6587 ) Fixes CVE-2017-11428	2018-03-02 02:32:08 +01:00
Eugen Rochko	47bdb9b33b	Fix #942 : Seamless LDAP login (#6556 )	2018-02-28 19:04:53 +01:00
masarakki	22a441e374	remove-uglifier (#6561 )	2018-02-26 16:19:48 +01:00
Akihiko Odaki	2e8a492e88	Raise Mastodon::HostValidationError when host for HTTP request is private (#6410 )	2018-02-24 19:16:11 +01:00
imncls	bb6988a7ac	Merge branch 'master' of https://github.com/tootsuite/mastodon # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb	2018-02-23 23:28:31 +09:00
Eugen Rochko	61ed133fea	Account archive download (#6460 ) * Fix #201: Account archive download * Export actor and private key in the archive * Optimize BackupService - Add conversation to cached associations of status, because somehow it was forgotten and is source of N+1 queries - Explicitly call GC between batches of records being fetched (Model class allocations are the worst offender) - Stream media files into the tar in 1MB chunks (Do not allocate media file (up to 8MB) as string into memory) - Use #bytesize instead of #size to calculate file size for JSON (Fix FileOverflow error) - Segment media into subfolders by status ID because apparently GIF-to-MP4 media are all named "media.mp4" for some reason * Keep uniquely generated filename in Paperclip::GifTranscoder * Ensure dumped files do not overwrite each other by maintaing directory partitions * Give tar archives a good name * Add scheduler to remove week-old backups * Fix code style issue	2018-02-21 23:21:32 +01:00
Eugen Rochko	a7171af0a3	Fix avatar and header issues by using custom geometry detector (#6515 ) * Fix avatar and header issues by using custom geometry detector Revert a part of #6508. The file passed to dynamic styles method was not actually a file, but an instance of Paperclip::Attachment, which broke all styles by always returning {} from the method. One problem with GIF avatars was that Paperclip::GeometryDetector reported wrong dimensions for them, e.g. 120x120 GIF avatar would for some reason be detected as 120x53. By writing our own geometry parser, we can use FastImage, which also happens to be faster than ImageMagick, to detect image dimensions, which are also correct. Unfortunately, this PR does not implement skipping a `convert` entirely if the dimensions are already correct, as I found no easy way to write that behaviour into Paperclip without rewriting the Paperclip::Thumbnail class. * Only invoke convert if dimension or format needs to be changed	2018-02-21 03:40:12 +01:00
David Yip	3d033a4687	Merge remote-tracking branch 'tootsuite/master' into merge-upstream Conflicts: Gemfile config/locales/simple_form.pl.yml	2018-02-17 00:02:37 -06:00
Eugen Rochko	9dbae6e8a1	Save video metadata and improve video OpenGraph tags (#6481 ) * Save metadata from video attachments, put correct dimensions into OG tags * Add twitter:player for videos * Fix code style and test	2018-02-16 07:22:20 +01:00
Jenkins	5ffa6f0fa1	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-02-11 18:17:11 +00:00
Eugen Rochko	cf36d184f4	Interactive `rake mastodon:setup` task (#6451 ) * Add better CLI prompt * Add rake mastodon:setup interactive wizard * Test db/redis/smtp configurations and add admin user at the end * Test database connection even when database does not exist yet	2018-02-11 18:40:57 +01:00
Jenkins	efc9ffcb80	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-02-11 04:10:16 +00:00
David Yip	9105b0c954	Introduce html2text for extracting plaintext from statuses. #236 . Unlike strip_tags, html2text will preserve text present in other nodes, e.g. anchor tags: [1] pry(main)> str = '<a href="http://www.example.com">A link</a>' => "<a href=\"http://www.example.com\">A link</a>" [2] pry(main)> Html2Text.convert(str) => "[A link](http://www.example.com)" [3] pry(main)> include ActionView::Helpers::SanitizeHelper => Object [4] pry(main)> strip_tags(str) => "A link" Preserving the href of an anchor allows keyword mutes to also match on URLs, which is something that the frontend regex filter can currently do.	2018-02-10 10:36:16 -06:00
Eugen Rochko	3ebc0ad4d3	Full-text search for authorized statuses (#6423 ) * Add full-text search for authorized statuses - Search API will return statuses that match the query - Only for logged in users - Only if you are author of the status, - Or you were mentioned in it - Or you favourited or reblogged it - Configuration over `ES_ENABLED`, `ES_HOST`, `ES_PORT`, `ES_PREFIX` - Run `rails chewy:deploy` to create & populate index Fix #5880 Fix #4293 Fix #1152 * Add commented out docker-compose configuration for ES container * Optimize index import, filter search results * Add basic normalization to the index * Add better stemming and normalization to the index * Skip webfinger request if search query includes both @ and a space * Fix code style * Visually separate search result sections * Fix code style issues	2018-02-09 23:04:47 +01:00
David Yip	a6fb1c58ee	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb	2018-02-04 16:36:19 -06:00
Eugen Rochko	38e0133e1b	Make PAM gem optional, allow configuration over environment (#6415 )	2018-02-04 15:05:53 +01:00
Eugen Rochko	26f21fd5a0	CAS + SAML authentication feature (#6425 ) * Cas authentication feature * Config * Remove class_eval + Omniauth initializer * Codeclimate review * Codeclimate review 2 * Codeclimate review 3 * Remove uid/email reconciliation * SAML authentication * Clean up code * Improve login form * Fix code style issues * Add locales	2018-02-04 05:42:13 +01:00
David Yip	4c1fd9a19c	Merge remote-tracking branch 'tootsuite/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss	2018-02-02 08:39:52 -06:00
Alexander	04fef7b888	pam authentication (#5303 ) * add pam support, without extra column * bugfixes for pam login * document options * fix code style * fix codestyle * fix tests * don't call remember_me without password * fix codestyle * improve checks for pam usage (should fix tests) * fix remember_me part 1 * add remember_token column because :rememberable requires either a password or this column. * migrate db for remember_token * move pam_authentication to the right place, fix logic bug in edit.html.haml * fix tests * fix pam authentication, improve username lookup, add comment * valid? is sometimes not honored, return nil instead trying to authenticate with pam * update devise_pam_authenticatable2 and adjust code. Fixes sideeffects observed in tests * update devise_pam_authenticatable gem, fixes for codeconventions, fix finding user * codeconvention fixes * code convention fixes * fix idention * update dependency, explicit conflict check * fix disabled password updates if in pam mode * fix check password if password is present, fix templates * block registration if account is maintained by pam * Revert "block registration if account is maintained by pam" This reverts commit 8e7a083d650240b6fac414926744b4b90b435f20. * fix identation error introduced by rebase * block usernames maintained by pam * document pam settings better * fix code style	2018-02-02 10:18:55 +01:00
Jenkins	0e10667fbe	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-24 19:17:11 +00:00
Eugen Rochko	d966878e87	Update goldfinger, ostatus2 and http.rb versions (#6337 )	2018-01-23 14:30:42 +01:00
David Yip	2ca965c704	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss	2018-01-19 15:22:10 -06:00
Yamagishi Kazutoshi	7233ac07d2	Add support Ruby v2.5.0 (#6097 )	2018-01-19 20:53:30 +01:00
David Yip	89a9d629f7	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: Gemfile.lock	2018-01-15 22:17:48 -06:00
Eugen Rochko	5276c0a090	HTML e-mails for UserMailer (#6256 ) - premailer gem to turn CSS into inline styles automatically - rework UserMailer templates - reword UserMailer templates	2018-01-16 03:29:11 +01:00
Jenkins	933840bebf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-03 04:17:11 +00:00
Patrick Figel	04ecf44c2f	Add confirmation step for email changes (#6071 ) * Add confirmation step for email changes This adds a confirmation step for email changes of existing users. Like the initial account confirmation, a confirmation link is sent to the new address. Additionally, a notification is sent to the existing address when the change is initiated. This message includes instruction to reset the password immediately or to contact the instance admin if the change was not initiated by the account owner. Fixes #3871 * Add review fixes	2018-01-02 16:55:00 +01:00
Jenkins	6b85dba8da	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-26 18:17:16 +00:00
beatrix	127bfda521	add ruby-progressbar to gemfile (fixes #6110 ) (#6111 )	2017-12-26 18:43:52 +01:00
beatrix	65d083338d	Merge pull request #263 from KnzkDev/optimize-paperclip Optimizing paperclip	2017-12-12 09:15:52 -05:00
ncls7615	c95af71da5	optimize paperclip	2017-12-12 12:29:09 +09:00
Yamagishi Kazutoshi	b0db4dad79	Revert fog-aws (ref #5604 ) (#5934 )	2017-12-09 00:47:52 +01:00
Eugen Rochko	42bcbd36b7	Remove rabl dependency (#5894 ) * Remove rabl dependency * Replicate old Oj configuration	2017-12-06 15:04:49 +09:00
Yamagishi Kazutoshi	47b0c61853	Unify file upload to using fog (#5604 )	2017-11-07 14:30:31 +01:00
Yamagishi Kazutoshi	a2a4bf4e78	Update dependencies for Ruby (2017-10-30) (#5566 ) * Update better_errors to version 2.4.0 * Update binding_of_caller to version 0.7.3 * Update bootsnap to version 1.1.5 * Update browser to version 2.5.2 * Update capistrano to version 3.10.0 * Update capistrano-bundler to version 1.3.0 * Update capistrano-rbenv to version 2.1.2 * Update capybara to version 2.15.4 * Update cld3 to version 3.2.1 * Update fabrication to version 2.18.0 * Update fog-openstack to version 0.1.22 * Update kaminari to version 1.1.1 * Update lograge to version 0.7.1 * Update nokogiri to version 1.8.1 * Update oj to version 3.3.9 * Update ox to version 2.8.1 * Update parallel_tests to version 2.17.0 * Update pkg-config to version 1.2.8 * Update rspec-rails to version 3.7.1 * Update rubocop to version 0.51.0 * Update scss_lint to version 0.55.0 * Update sidekiq to version 5.0.5 * Update sidekiq-scheduler to version 2.1.10 * Update tzinfo-data to version 1.2017.3 * Update webpacker to version 3.0.2 * bundle update	2017-10-31 12:22:32 +01:00
unarist	a5143df303	Add strong_migrations to production dependency (#5234 )	2017-10-06 03:24:54 +02:00
Eugen Rochko	35a8cafa35	Replace self-rolled statsd instrumention with localshred/nsa (#5118 )	2017-09-29 03:16:44 +02:00
Yamagishi Kazutoshi	901fc48aae	Upgrade Webpacker to version 3.0.1 (#5122 )	2017-09-27 14:41:54 +02:00
Eugen Rochko	6e83b5e719	Update brakeman to 3.0 and bundler-audit to 0.6 (#5117 )	2017-09-27 03:13:09 +02:00
Eugen Rochko	b982d549f4	Add strong_migrations gem to warn when creating unsafe migrations (#5078 )	2017-09-25 02:11:14 +02:00
Akihiko Odaki	48d77ea1eb	Fix filterable_languages method of SettingsHelper (#4966 )	2017-09-16 14:59:41 +02:00
Grey Baker	a6a206ef85	Bump puma from 3.9.1 to 3.10.0 (#4879 ) Bumps [puma](https://github.com/puma/puma) from 3.9.1 to 3.10.0. - [Release notes](https://github.com/puma/puma/releases/tag/v3.10.0) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v3.9.1...v3.10.0)	2017-09-11 23:43:19 +02:00
Grey Baker	bbff144004	Bump rails from 5.1.3 to 5.1.4 (#4875 ) Bumps [rails](https://github.com/rails/rails) from 5.1.3 to 5.1.4. - [Commits](https://github.com/rails/rails/compare/v5.1.3...v5.1.4)	2017-09-11 23:03:14 +02:00
Eugen Rochko	1caf11ddcc	Fix language filter codes (#4841 ) * Fix language filter codes CLD3 returns BCP-47 language identifier, filter settings expect identifiers in the ISO 639-1 format. Convert between formats, and exclude duplicate languages from filter choices (zh-CN->zh) * Fix zh name	2017-09-08 12:32:22 +02:00
Adam Thurlow	6994664a13	swift-enable the paperclip! 📎 (#2322 )	2017-09-05 23:17:06 +02:00
Eugen Rochko	00840f4f2e	Add handling of Linked Data Signatures in payloads (#4687 ) * Add handling of Linked Data Signatures in payloads * Add a way to sign JSON, fix canonicalization of signature options * Fix signatureValue encoding, send out signed JSON when distributing * Add missing security context	2017-08-26 13:47:38 +02:00
nullkal	54a04e3658	Update charlock_holmes to 0.7.5 (#4620 )	2017-08-17 14:46:53 +02:00
Eugen Rochko	399f9f4a4e	Update Goldfinger gem to 2.0 (#4286 ) - No masking of HTTP::Error and OpenSSL::SSL::SSLError - No longer accepts non-HTTPS WebFinger endpoints	2017-07-21 13:40:48 +02:00
Eugen Rochko	a390abdefb	Use the same emoji data on the frontend and backend (#4284 ) * Use the same emoji data on the frontend and backend * Move emoji.json to repository, add tests This way you don't need to install node dependencies if you only want to run Ruby code	2017-07-21 04:27:40 +02:00
Eugen Rochko	8400bee3b1	Refactor ResolveRemoteAccountService (#4258 ) * Refactor ResolveRemoteAccountService * Remove trailing whitespace * Use redis locks around critical ResolveRemoteAccountService code * Add test for race condition of lock	2017-07-19 14:44:04 +02:00
ThibG	05cd37097c	Optimize uri normalization (#4212 ) * Add dependency on idn-ruby to speed up URI normalization * Use normalized_host instead of normalize.host when applicable When we are only interested in the normalized host, calling normalized_host avoids normalizing the other components of the URI as well as creating a new object	2017-07-15 17:24:35 +02:00
unarist	8d224ad23b	Follow renaming of microformats2 gem (#4203 )	2017-07-14 19:57:49 +02:00
Eugen Rochko	e2685ccc81	Fix #4149 , fix #1199 - Store emojis as unicode (#4189 ) - Use unicode when selecting emoji through picker - Convert shortcodes to unicode when storing text input server-side - Do not convert shortcodes in JS anymore	2017-07-14 19:47:53 +02:00
Sorin Davidoi	0c7c188c45	Web Push Notifications (#3243 ) * feat: Register push subscription * feat: Notify when mentioned * feat: Boost, favourite, reply, follow, follow request * feat: Notification interaction * feat: Handle change of public key * feat: Unsubscribe if things go wrong * feat: Do not send normal notifications if push is enabled * feat: Focus client if open * refactor: Move push logic to WebPushSubscription * feat: Better title and body * feat: Localize messages * chore: Fix lint errors * feat: Settings * refactor: Lazy load * fix: Check if push settings exist * feat: Device-based preferences * refactor: Simplify logic * refactor: Pull request feedback * refactor: Pull request feedback * refactor: Create /api/web/push_subscriptions endpoint * feat: Spec PushSubscriptionController * refactor: WebPushSubscription => Web::PushSubscription * feat: Spec Web::PushSubscription * feat: Display first media attachment * feat: Support direction * fix: Stuff broken while rebasing * refactor: Integration with session activations * refactor: Cleanup * refactor: Simplify implementation * feat: Set VAPID keys via environment * chore: Comments * fix: Crash when no alerts * fix: Set VAPID keys in testing environment * fix: Follow link * feat: Notification actions * fix: Delete previous subscription * chore: Temporary logs * refactor: Move migration to a later date * fix: Fetch the correct session activation and misc bugs * refactor: Move migration to a later date * fix: Remove follow request (no notifications) * feat: Send administrator contact to push service * feat: Set time-to-live * fix: Do not show sensitive images * fix: Reducer crash in error handling * feat: Add badge * chore: Fix lint error * fix: Checkbox label overlap * fix: Check for payload support * fix: Rename action "type" (crash in latest Chrome) * feat: Action to expand notification * fix: Lint errors * fix: Unescape notification body * fix: Do not allow boosting if the status is hidden * feat: Add VAPID keys to the production sample environment * fix: Strip HTML tags from status * refactor: Better error messages * refactor: Handle browser not implementing the VAPID protocol (Samsung Internet) * fix: Error when target_status is nil * fix: Handle lack of image * fix: Delete reference to invalid subscriptions * feat: Better error handling * fix: Unescape HTML characters after tags are striped * refactor: Simpify code * fix: Modify to work with #4091 * Sort strings alphabetically * i18n: Updated Polish translation it annoys me that it's not fully localized :P * refactor: Use current_session in PushSubscriptionController * fix: Rebase mistake * fix: Set cacheName to mastodon * refactor: Pull request feedback * refactor: Remove logging statements * chore(yarn): Fix conflicts with master * chore(yarn): Copy latest from master * chore(yarn): Readd offline-plugin * refactor: Use save! and update! * refactor: Send notifications async * fix: Allow retry when push fails * fix: Save track for failed pushes * fix: Minify sw.js * fix: Remove account_id from fabricator	2017-07-13 22:15:32 +02:00
nullkal	007ab330e6	Use charlock_holmes instead of nkf at FetchLinkCardService (#4080 ) * Specs for language detection * Use CharlockHolmes instead of NKF * Correct mistakes * Correct style * Set hint_enc instead of falling back and strip_tags * Improve specs * Add dependencies	2017-07-08 22:44:31 +02:00
Eugen Rochko	8b2cad5637	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090 )	2017-07-07 04:02:06 +02:00
Akihiko Odaki (@fn_aki@pawoo.net)	a37cf9548c	Explicitly require MIME::Types (#4083 )	2017-07-05 23:58:03 +02:00
Eugen Rochko	f7301bd5b9	Add overview of active sessions (#3929 ) * Add overview of active sessions * Better display of browser/platform name * Improve how browser information is stored and displayed for sessions overview * Fix test	2017-06-25 16:54:30 +02:00
Yamagishi Kazutoshi	53e42bf91e	Upgrade Webpacker to version 2.0 (#3729 )	2017-06-18 02:57:09 +02:00
Matt Jankowski	5be1214c26	Gem version bumps (#3524 ) * Update annotate to version 2.7.2 * Update puma to version 3.9.0 * Update aws-sdk to version 2.9.28 * Update bootsnap to version 1.0.0 * Update nio4r to version 2.1.0 * Update nokogumbo to version 1.4.12 * Update oj to version 3.0.11 * Update pkg-config to version 1.2.3 * Update rubocop to version 0.49.1 * Update sidekiq-scheduler to version 2.1.5	2017-06-05 01:10:13 +02:00
takayamaki	3eedad2737	change sidekiq queueing to bulk push (#3536 )	2017-06-04 00:11:15 +02:00
Clworld	18fe77084f	bump rails version in Gemfile: '~> 5.0.0' -> '~> 5.1.0' (#3523 )	2017-06-02 20:11:13 +02:00
Yamagishi Kazutoshi	41fa53253c	Keep ENV['LOCAL_HTTPS'] with ApplicationControllerSpec (fix random fail) (#3479 ) * Keep ENV['LOCAL_HTTPS'] with ApplicationControllerSpec (fix random fail) * use climate_control	2017-05-31 17:09:17 +02:00
Jack Jennings	3a2003ba86	Extract authorization policy for viewing statuses (#3150 )	2017-05-29 18:22:22 +02:00
Matt Jankowski	5e2c5e95b6	Version bumps for non-rails gems (#3398 ) * Update xpath to version 2.1.0 * Update aws-sdk to version 2.9.25 * Update oj to version 3.0.10 * Update brakeman to version 3.6.2 * Update rufus-scheduler to version 3.4.2 * Update doorkeeper to version 4.2.6 * Update rubocop to version 0.49.0	2017-05-29 18:18:06 +02:00
masarakki	4bd327a0c5	fix-rails-minor-version (#3403 )	2017-05-29 17:52:26 +02:00
Eugen Rochko	3b4095cf1b	Update bootsnap to 0.3.0 (fix xattr.h error) (#3390 )	2017-05-28 16:32:29 +02:00
Eugen Rochko	c2f70829d9	Adds bootsnap. Faster boot time (#3176 )	2017-05-20 19:42:27 +02:00
Matt Jankowski	5f727f9068	Update rails to version 5.0.3 (#3054 ) * Update rails to version 5.0.3 * Update aws-sdk to version 2.9.17 * Update capistrano to version 3.8.1 * Update climate_control to version 0.2.0 * Update debug_inspector to version 0.0.3 * Update et-orbi to version 1.0.4 * Update oj to version 3.0.7 * Update microformats2 to version 2.9.0 * Update lograge to version 0.5.1 * Clean up usage of Microformats2 object to remove deprecation warnings * Update microformats2 to version 3.0.1	2017-05-14 16:30:14 +02:00
Yamagishi Kazutoshi	a822f7a05a	Stop require of i18n-tasks (#2992 )	2017-05-11 15:11:59 +02:00
Jack Jennings	c78e8c01a3	Add pessimistic constraints to gem versions (#2980 )	2017-05-11 11:27:01 +02:00
Akihiko Odaki	d5cabfe5c6	Use CLD3 (#2949 ) Compact Language Detector v3 (CLD3) is the successor of CLD2, which was used in the previous implementation. CLD3 includes improvements since CLD2, and supports newer compilers. On the other hand, it has additional requirements and cld3-ruby, the FFI of CLD3 for Ruby, is still new and may be still inmature. Though CLD3 is named after CLD2, it is implemented with a neural network model, different from the old implementation, which is based on a Naïve Bayesian classifier. CLD3 supports newer compilers, such as GCC 6. CLD2 is not compatible with GCC 6 because it assigns negative values to varibales typed unsigned. (see internal/cld_generated_cjk_uni_prop_80.cc) The support for GCC 6 and newer compilers are essential today, when some server operating system such as Ubuntu Server 16.10 has GCC 6 by default. On the one hand, CLD3 requires C++11 support. Environments with old compilers such as Ubuntu Server 14.04 needs to update the system or install a newer compiler. CLD3 needs protocol buffers as a new dependency. However,it is not considered problematic because major server operating systems, CentOS and Ubuntu Server provide them. The FFI cld3-ruby was written by me (Akihiko Odaki) for use in Mastodon. It is still new and may be inmature, but confirmed to pass existing tests.	2017-05-09 19:58:03 +02:00
alpaca-tc	ef226a6f22	Remove rails_12factor (#2901 )	2017-05-09 05:15:54 +02:00
Matt Jankowski	aef554d553	Misc gem bumps (#2919 ) * Update bundler-audit to version 0.5.0 * Update oj to version 3.0.6 * Update http-form_data to version 1.0.2 * Update parallel to version 1.11.2 * Update rails-i18n to version 5.0.4 * Update rack-protection to version 2.0.0 * Update haml to version 5.0.1 * Update scss_lint to version 0.53.0 * Relax requirement on i18n-tasks * Remove haml and haml_lint gem requirement	2017-05-08 18:55:42 +02:00
yhirano	48594b18e6	Added haml-lint and fix warnings (#2773 ) * add haml_lint to Gemfile * add .haml-lint.yml * fix warnings of haml_lint	2017-05-08 03:35:25 +02:00
yhirano	d63c291f86	Enable CodeClimate SCSS Lint checks (#2886 ) * add scss_lint to Gemfile * add .scss-lint.yml * fix warnings of scss-lint * chmod -x styles/variables.scss * Enable CodeClimate SCSS Lint checks	2017-05-07 20:47:31 +02:00
beatrix	5c1f70b5c5	namespace redis usage (#2869 ) * add redis-namespace gem * namespace redis usage * refactor redis namespace code to be less intrusive previously : would be prepended to keys when the REDIS_NAMESPACE env var was not set now if it is not set the namespacing functions are not used at all, which should prevent disruptions when instances update. * fix redis namespace variable style in streaming js * remove trailing space * final redis namespace style fix	2017-05-07 19:42:32 +02:00
Yamagishi Kazutoshi	f000673599	Remove local_time gem, and add similar (#2875 )	2017-05-07 15:22:54 +02:00
yhirano	bfbfaf9f9f	Enable CodeClimate Brakeman checks (#2861 ) * add brakeman to Gemfile * Enable CodeClimate brakeman checks * add config/brakeman.ignore	2017-05-07 02:45:33 +02:00
yhirano	87588fa894	Enable CodeClimate Bundler-Audit checks (#2862 ) * add bundler-audit to Gemfile * Enable CodeClimate bundler-audit checks	2017-05-07 02:41:12 +02:00
Eugen Rochko	81584779cb	More robust PuSH subscription refreshes (#2799 ) * Fix #2473 - Use sidekiq scheduler to refresh PuSH subscriptions instead of cron Fix an issue where / in domain would raise exception in TagManager#normalize_domain PuSH subscriptions refresh done in a round-robin way to avoid hammering a single server's hub in sequence. Correct handling of failures/retries through Sidekiq (see also #2613). Optimize Account#with_followers scope. Also, since subscriptions are now delegated to Sidekiq jobs, an uncaught exception will not stop the entire refreshing operation halfway through Fix #2702 - Correct user agent header on outgoing http requests * Add test for SubscribeService * Extract #expiring_accounts into method * Make mastodon:push:refresh no-op * Queues are now defined in sidekiq.yml * Queues are now in sidekiq.yml	2017-05-05 02:23:01 +02:00
Matt Jankowski	f9d398e8fb	Remove the react-rails gem (#2801 ) * Remove react-rails gem * Fix broken view spec	2017-05-04 23:45:18 +02:00
Matt Jankowski	2bd132d458	Replace best_in_place editor on admin settings page (#2789 ) * Remove best_in_place * Replace best_in_place usage with rails helpers * Move admin/settings#index to #edit action * Remove click_to__edit from i18n	2017-05-04 18:12:44 +02:00
Matt Jankowski	8c5ad23b24	Language improvements, replace whatlanguage with CLD (#2753 ) * add failing en specs * add cld2 gem * Replace WhatLanguage with CLD	2017-05-03 16:59:31 +02:00
Keiji Matsuzaki	90c00f075a	Added support parallel_tests (#2740 ) - Added new gem the `parallel_tests`. - Updated .travis.yml. - Improved scripts and environment variable.	2017-05-03 12:20:38 +02:00
Eugen Rochko	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	2017-05-03 02:04:16 +02:00
yhirano	298796cc7b	annotate models (#2697 ) * add annotate to Gemfile * rails g annotate:install * configure annotate_models * add schema info to models * fix rubocop to add frozen_string_literal	2017-05-02 02:14:47 +02:00
yhirano	8325866c61	Downgrade rubocop 0.48.1 => 0.46.0 (#2628 ) * downgrade rubocop 0.48.1 => 0.46.0 * exclude vendor/*/ from rubocop target files * add frozen_string_literal comment line * fix percent literal delimited by ( and ) * fix alignment * remove comment disabling unknown cop	2017-04-30 00:23:45 +02:00
y-temp4	2ca246d7d1	Use the new Ruby 1.9 hash syntax (#2577 )	2017-04-28 09:07:16 -04:00
Eugen Rochko	88725d6ce8	OEmbed support for PreviewCard (#2337 ) * OEmbed support for PreviewCard * Improve ProviderDiscovery code failure treatment * Do not crawl links if there is a content warning, since those don't display a link card anyway * Reset db schema * Fresh migrate * Fix rubocop style issues Fix #1681 - return existing access token when applicable instead of creating new * Fix test * Extract http client to helper * Improve oembed controller	2017-04-27 14:42:22 +02:00
Matt Jankowski	452dc6b5fe	Use local_time gem for timezone replacement (#2174 ) For the 'time ago' value of stream entry simple statuses and the timestamp value of detailed statuses - output their UTC value and use the browser timezone to convert locally.	2017-04-21 18:19:59 +02:00
Eugen	e4af4898de	Add language detection (#1772 ) * Add language detection via WhatLanguage and (de)serialization of it through Atom * Fix default language in ProcessFeedService * Re-add newline before 'react-rails' Gem to fix groupings Fixes Code Climate issue	2017-04-16 20:32:17 +02:00
Eugen	7e2e0d6dcc	Fix #1670 - Update OStatus2 gem (#1936 )	2017-04-16 19:32:47 +02:00
Akihiko Odaki	0611209141	Relax Ruby version requirement (#1901 )	2017-04-16 14:57:30 +02:00
Alex Dunn	865cb39e9b	lock capistrano to 3.8.0 (#1890 )	2017-04-16 12:52:18 +02:00
luigi	f97272549c	Remove unused gem: coffee-rails (#1885 )	2017-04-16 04:02:29 +02:00
Hiromi Kai	7b10794afb	Add rails-i18n gem (#1837 )	2017-04-15 13:32:53 +02:00
Ben Roberts	89707ad0ac	add basic microformats tests (#1803 ) as suggested, moving to view tests rather than a controller test replaces https://github.com/tootsuite/mastodon/pull/1786 which i will close momentary	2017-04-15 02:37:00 +02:00
Chad Pytel	92cd207c50	Introduce capybara and first feature spec (#1801 ) This commit introduces Capybara and the first feature spec. I focused on coverage for log in for the first feature spec because that would have prevented `624a9a7136` causing #1236.	2017-04-15 01:21:02 +02:00
Bryce Chidester	067eb220c6	Include pkg-config as a gem dependency. (#1717 ) The pkg-config gem was necessary in order for nokogiri to find the system libraries when building on OpenBSD. Closes #1637 Signed-off-by: Bryce Chidester <bryce@cobryce.com>	2017-04-14 11:15:03 +02:00
maxypy	a6807201d2	Implementing Subresource Integrity (#1729 ) * Add sprockets-rails to Gemfile * Add sprockets-rails to Gemfile.lock * Update show.html.haml * Update index.html.haml * Update admin.html.haml * Update auth.html.haml * Update embedded.html.haml * Update public.html.haml	2017-04-14 11:09:20 +02:00
Matt Jankowski	4ada50985a	Pagination improvements (#1445 ) * Replace will_paginate with kaminari * Use #page instead of #paginate in controllers * Replace will_paginate.page_gap with pagination.truncate in i18n * Customize kaminari views to match prior styles * Set kaminari options to match prior behavior * Replace will_paginate with paginate in views	2017-04-11 01:11:41 +02:00
Eugen	2810013b93	API param to exclude notification types from response (#1341 ) * Add exclude_types param to /api/v1/notifications * Exclude notification types in web UI through exclude_types in the API	2017-04-10 23:45:29 +02:00
Matt Jankowski	64dbde0dbf	Version bumps for ruby and misc gems (#1159 ) * Update rspec-rails to version 3.5.2 * Update addressable to version 2.5.1 * Update autoprefixer-rails to version 6.7.7.1 * Update bullet to version 5.5.1 * Update domain_name to version 0.5.20170404 * Update letter_opener_web to version 1.3.1 * Upate redis-rails to version 5.0.2 * Update active_record_query_trace to version 1.5.4 * Update capistrano-rails to version 1.2.3 * Update dotenv-rails to version 2.2.0 * Update pg to version 0.20.0 * Update tilt to version 2.0.7 * Update warden to version 1.2.7 * Update tins to version 1.13.2 * Update terminal-table to version 1.7.3 * Update oj to version 2.18.5 * Update simplecov to version 0.14.1 * Update uglifier to version 3.1.13 * Update hashdiff to version 0.3.2 * Update webmock to version 2.3.2 * Update devise to version 4.2.1 * Use ruby version 2.4.1 * Update sass to version 3.4.23 * Update puma to version 3.8.2 * Update will_paginate to version 3.1.5 * Update font-awesome-rails to version 4.7.0.1 * Update fuubar to version 2.2.0 * Update pry-rails to version 0.3.6 * Update simple-navigation to version 4.0.5 * Update rubocop to version 0.48.1 * Update doorkeeper to version 4.2.5 * Update faker to version 1.7.3 * Update aws-sdk to version 2.9.5 * Update fabrication to version 2.16.1 * Update hamlit-rails to version 0.2.0 * Update http to version 2.2.1 * Update httplog to version 0.99.2 * Update sidekiq to version 4.2.10 * Update rspec-sidekiq to version 3.0.0 * Update pghero to version 1.6.4 * Update rack-cors to version 0.4.1 * Update i18n-tasks to version 0.9.13 * Update ruby-oembed to version 0.12.0 * Update jquery-rails to version 4.3.1 * Update simple_form to version 3.4.0 * Update react-rails to version 1.11.0 * Update aws-sdk to version 2.9.6 * Update sidekiq-unique-jobs to version 5.0.0 * Update uglifier to version 3.2.0	2017-04-10 22:47:41 +02:00
David Authier	f0bd439486	Use HTTP Accept-Language to detect locale (#1166 ) * Use HTTP Accept-Language to detect locale * Fix gem order to comply with codeclimate * Sort gem to comply with rubocop * I18n.default_locale fallback when there is no accept-language header	2017-04-09 18:40:24 +02:00
Eugen	6d6a429af8	Rewrite Atom generation from stream entries to use Ox instead of Nokogiri (#1124 ) * Rewrite Atom generation from stream entries to use Ox instead of Nokogiri::Builder StreamEntry is now limited to only statuses, which allows some optimization. Removed extra queries on AccountsController#show. AtomSerializer instead of AtomBuilderHelper used in AccountsController#show, StreamEntriesController#show, StreamEntryRenderer and PubSubHubbub::DistributionWorker PubSubHubbub::DistributionWorker moves n+1 DomainBlock query to PubSubHubbub::DeliveryWorker instead. All Salmon slaps that aren't based on StreamEntry still use AtomBuilderHelper and Nokogiri * All Salmon slaps now use Ox instead of Nokogiri. No touch from status on account	2017-04-07 05:56:56 +02:00
Kurtis Rainbolt-Greene	03adb5d727	Mastodon isn't using jbuilder or sdoc, and it prevents an upgrade to 2.4.0	2017-04-04 21:31:02 -07:00
Samy KACIMI	5af0ecbcd9	alphebatically order test gem group as required by rubocop	2017-04-05 00:52:55 +02:00
Samy KACIMI	79ef756f64	fix rubocop issues	2017-04-05 00:47:17 +02:00
Samy KACIMI	81c76fe375	add more tests to models	2017-04-05 00:29:56 +02:00
Eugen Rochko	38b504b7a7	Remove sidekiq-merger	2017-04-04 14:28:57 +02:00
Eugen Rochko	82aaedec46	Reduce number of items in feeds, optimize regeneration worker slightly, make regeneration worker unique, (only schedule/execute once at a time)	2017-04-04 13:58:34 +02:00
Eugen Rochko	ce9df2fa82	Optimize filter methods in FeedManager a bit, use redis pipelining on merge/unmerge feed methods, do not re-create a dynamic class on each feed push call, make sure redis-rb uses hiredis	2017-04-04 13:01:14 +02:00
Wonderfall	92d35c52d9	update Dockerfile	2017-04-03 00:46:44 +02:00
Eugen Rochko	5b12624847	Add proper error page for request timeouts	2017-04-02 19:43:44 +02:00
Eugen Rochko	7637386228	Upgrade Rails to 5.0.2	2017-03-22 15:37:03 +01:00
Eugen Rochko	ad0d82d3ce	Make account search blazing fast and rank followers/followees higher in the results	2017-03-17 20:48:14 +01:00
Eugen Rochko	3202bdd744	Fix #555 - Use a better URL parser	2017-02-22 19:35:11 +01:00
Eugen Rochko	9c88d1b99e	Speed up capistrano deployments	2017-02-16 02:34:21 +01:00
Eugen Rochko	920ba5fc4e	Fix #61 - Add list of blocked users to the UI; clean up failed push notifications API Try to fix Travis CI setup	2017-02-05 19:18:11 +01:00
Eugen Rochko	a2a85e8549	Add capistrano to development environment	2017-01-30 20:03:17 +01:00
Eugen Rochko	3f075c7794	API for apps to register for push notifications	2017-01-29 01:30:32 +01:00
Eugen Rochko	ba192f12e3	Added optional two-factor authentication	2017-01-27 20:35:16 +01:00
Eugen Rochko	cc5c1e5feb	Removed accidental n+1 query from notifications, updated some deps, improved how "show more" link looks	2017-01-26 14:52:07 +01:00
Eugen Rochko	d4d56b8af0	Fix #365 , 1/2 of #408 - replace rails_autolink with URI.regexp, run link_hashtags on simplified_format	2017-01-23 14:45:09 +01:00
Effy Elden	5fef55c11a	Set remote dev environments to use letter_opener_web, add default .env.vagrant variables	2017-01-21 20:22:49 +11:00
Eugen Rochko	f0de621e76	Fix #463 - Fetch and display previews of URLs using OpenGraph tags	2017-01-20 01:00:14 +01:00
Eugen Rochko	f051c2e813	Fix statsd null backend not being initialized properly	2017-01-19 09:37:07 +01:00
Eugen Rochko	306eb6e9c9	Add optional StatsD performance tracking	2017-01-18 23:44:29 +01:00
Eugen Rochko	b11fdc3ae3	Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings with YAML-defined defaults. Add admin page for editing global settings. Add "site_description" setting that would show as a paragraph on the frontpage	2017-01-12 20:46:24 +01:00
Eugen Rochko	7951e7ffd5	Add ruby version to Gemfile, move devDependencies in package.json to dependencies, fix bug in process feed service	2017-01-11 15:39:31 +01:00
Eugen Rochko	c128fcee16	Update Rails to 5.0.1	2016-12-21 19:09:59 +01:00
Eugen Rochko	76ec907993	Improved admin UI	2016-12-13 13:42:10 +01:00
Eugen Rochko	5973ca3d11	Upgrade Paperclip to 5, AWS-SDK to 2, do not generate medium/small versions of avatars	2016-11-29 14:20:15 +01:00
Eugen Rochko	cc70f28f19	Adding rack timeout of 30sec, PuSH jobs moved to push queue so they can be processed separately	2016-11-29 02:07:14 +01:00
Eugen Rochko	8efa081f21	Remove Neo4J	2016-11-24 23:46:27 +01:00
Eugen Rochko	8e34bed7cc	Mini Profiler not working well, remove it	2016-11-24 19:59:11 +01:00
Eugen Rochko	fc90d38893	Moving some counter queries out of subqueries in the API	2016-11-22 22:59:54 +01:00
Eugen Rochko	4b5b953d42	Upgrade to latest Rails, which apparently improves ActionCable performance	2016-11-22 22:26:44 +01:00
Eugen Rochko	546c4718e7	Localizations for most server-side strings	2016-11-16 00:55:33 +01:00
Eugen Rochko	fdc17bea58	Fix rubocop issues, introduce usage of frozen literal to improve performance	2016-11-15 16:56:29 +01:00
Eugen Rochko	09218d4c01	Use full-text search for autosuggestions	2016-11-12 14:36:10 +01:00
Eugen Rochko	448ab18a20	Replace setting custom CORS headers with rack-cors, set it on /oauth/token endpoint	2016-11-09 18:06:01 +01:00
Eugen Rochko	d0d799f911	Replace react-skylight with own solution that centers images better	2016-11-07 18:23:36 +01:00
Eugen Rochko	ea4170785a	Downgrade aws gem as this one was incompatible with Paperclip	2016-11-06 20:55:57 +01:00
Eugen Rochko	3ab193bc3f	Adding optional S3, fail-mastodon	2016-11-06 18:35:46 +01:00
Eugen Rochko	6471a548fe	Add pghero for analyzing postgres performance in production	2016-11-04 18:35:04 +01:00
Eugen Rochko	53fb7b1aa8	Replace in-memory cache store with redis store, should decrease memory footprint of each running process by 128mb	2016-11-02 13:30:52 +01:00
Eugen Rochko	e21a3fe0cd	Adding sync of follow relationships to Neo4J, accounts/suggestions API	2016-10-14 23:10:07 +02:00
Eugen Rochko	06016453bd	Adding user settings (model and mailer), no form yet	2016-10-07 13:17:56 +02:00
Eugen Rochko	4909bbf415	Add logging for outgoing http requests	2016-10-02 14:58:06 +02:00
Eugen Rochko	57583f3fb8	Improve partial rendering and Haml performance (Haml->Hamlit)	2016-09-24 13:40:42 +02:00
Eugen Rochko	4bec613897	Fix #24 - Thread resolving for remote statuses This is a big one, so let me enumerate: Accounts as well as stream entry pages now contain Link headers that reference the Atom feed and Webfinger URL for the former and Atom entry for the latter. So you only need to HEAD those resources to get that information, no need to download and parse HTML <link>s. ProcessFeedService will now queue ThreadResolveWorker for each remote status that it cannot find otherwise. Furthermore, entries are now processed in reverse order (from bottom to top) in case a newer entry references a chronologically previous one. ThreadResolveWorker uses FetchRemoteStatusService to obtain a status and attach the child status it was queued for to it. FetchRemoteStatusService looks up the URL, first with a HEAD, tests if it's an Atom feed, in which case it processes it directly. Next for Link headers to the Atom feed, in which case that is fetched and processed. Lastly if it's HTML, it is checked for <link>s to the Atom feed, and if such is found, that is fetched and processed. The account for the status is derived from author/name attribute in the XML and the hostname in the URL (domain). FollowRemoteAccountService and ProcessFeedService are used. This means that potentially threads are resolved recursively until a dead-end is encountered, however it is performed asynchronously over background jobs, so it should be ok.	2016-09-21 01:50:31 +02:00
Eugen Rochko	af375b5bac	Update sidekiq, remove sinatra dependency	2016-09-18 13:40:30 +02:00
Eugen Rochko	ce29624c6d	Fixing image upload limits, allowing webm, merge/unmerge events trigger timeline reload in UI, other small fixes	2016-09-12 18:22:43 +02:00
Eugen Rochko	85d89b472d	Optimized n+1 queries in accounts Atom and HTML views Added stack trace for SQL queries in development Removed badly thought out accounts/lookup API	2016-09-08 20:36:01 +02:00
Eugen Rochko	0f4bc56719	Improving production logs, removing n+1 on media attachments in atom, adding attachments display to static views	2016-09-08 01:24:26 +02:00
Eugen Rochko	bc0692d75b	Removing mini-profiler that doesn't work, formatting timelines a bit better	2016-08-24 19:23:37 +02:00
Eugen Rochko	49520d6e62	Adding React.js, Redux, revamping dashboard	2016-08-24 17:56:44 +02:00
Eugen Rochko	6deb9f966e	Live timelines using ActionCable	2016-08-18 15:49:51 +02:00
Eugen Rochko	10ba09f546	Upgrade to Rails 5.0.0.1	2016-08-17 17:58:00 +02:00
Eugen Rochko	85b00d19b8	Moving Salmon notifications to background processing, fixing mini-profiler behaviour with Turbolinks enabled, optimizing Rabl for production	2016-03-26 13:42:10 +01:00
Eugen Rochko	318886287b	Fixing some stuff for Turbolinks, adding gzip on top, fixing a n+1 query	2016-03-25 15:09:40 +01:00
Eugen Rochko	e24bfbde1a	Fixing FanOutOnWriteService, fixing Sidekiq not having enough DB connections in the pool, adding a throttle of 60rpm per IP, adding mini profiler, adding admin status to users	2016-03-25 14:12:24 +01:00
Eugen Rochko	42dcb0d4cb	Adding Sidekiq for background processing (firstly just of mailers)	2016-03-25 02:50:48 +01:00
Eugen Rochko	f14f462eaf	Adding Turbolinks, adding status posting form on homepage	2016-03-21 18:26:47 +01:00
Eugen Rochko	19a259915e	Security update	2016-03-21 10:08:19 +01:00
Eugen Rochko	e2b846f630	Adding letter opener for development and Rack::Attack for future rate limiting implementations	2016-03-19 14:57:30 +01:00
Eugen Rochko	c349200761	Removing some unused gems, adding pagination to profiles, fix #10	2016-03-19 12:49:34 +01:00
Eugen Rochko	3441361568	Adding simple_form, adding profile settings, header image	2016-03-12 20:47:22 +01:00
Eugen Rochko	aab9f57e36	Adding config for puma, dashboard layout, fixing some queries	2016-03-12 16:21:53 +01:00
Eugen Rochko	447cfef62d	Improving feed queries, switching API to doorkeeper authentication	2016-03-11 16:47:36 +01:00
Eugen Rochko	6c4c84b161	Distrubute statuses as a fan-out-on-write system, with optional precomputing	2016-03-08 20:20:45 +01:00
Eugen Rochko	ab6696e855	Adding doorkeeper, adding a REST API POST /api/statuses Params: status (text contents), in_reply_to_id (optional) GET /api/statuses/:id POST /api/statuses/:id/reblog GET /api/accounts/:id GET /api/accounts/:id/following GET /api/accounts/:id/followers POST /api/accounts/:id/follow POST /api/accounts/:id/unfollow POST /api/follows Params: uri (e.g. user@domain) OAuth authentication is currently disabled, but the API can be used with HTTP Auth.	2016-03-07 12:42:33 +01:00
Eugen Rochko	3824c58853	Adding GNU Public license, adding home timeline, reblog/favourite counters	2016-03-06 17:52:23 +01:00
Eugen Rochko	7e93da3f8d	Removing grape and adding devise	2016-03-05 13:12:24 +01:00
Eugen Rochko	0e8f59c16f	Refactoring Grape API methods into normal controllers & other things	2016-02-29 19:42:08 +01:00
Eugen Rochko	11ff92c9d7	Adding a test for ReblogService, fixing mentions for remote statuses	2016-02-28 21:22:56 +01:00
Eugen Rochko	2c70f0ecaa	Adding paperclip for avatars, fixing design of the public pages	2016-02-28 00:02:59 +01:00
Eugen Rochko	24646d5769	Adding views for the profile and entry pages	2016-02-26 20:48:20 +01:00
Eugen Rochko	f16b31f077	Adding a bunch of tests	2016-02-26 15:28:08 +01:00
Eugen Rochko	71fe24096c	Adding a Mention model, test stubs	2016-02-25 00:17:01 +01:00
Eugen Rochko	fa7868675d	Send Salmon interactions	2016-02-24 12:57:29 +01:00
Eugen Rochko	709c6685a9	Made some progress	2016-02-22 16:00:20 +01:00
Eugen Rochko	9c4856bdb1	Initial commit	2016-02-20 22:53:20 +01:00

... 16 17 18 19 20 ...

1226 commits