glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	8410fcd3a7	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	9526b0abd7	Bump puma from 3.12.0 to 3.12.1 (#10331 ) Bumps [puma](https://github.com/puma/puma) from 3.12.0 to 3.12.1. - [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.12.0...v3.12.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	098c21c354	Bump oj from 3.7.10 to 3.7.11 (#10332 ) Bumps [oj](https://github.com/ohler55/oj) from 3.7.10 to 3.7.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.7.10...v3.7.11) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	69d4cfe90f	Bump capybara from 3.14.0 to 3.15.0 (#10330 ) Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.14.0 to 3.15.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.14.0...3.15.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	c37bc0b268	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.	6 years ago
dependabot[bot]	506e50f8c2	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>	6 years ago
dependabot[bot]	5389826d69	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>	6 years ago
Thibaut Girka	365de06816	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.	6 years ago
dependabot[bot]	8fc429abe9	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>	6 years ago
dependabot[bot]	4884dec606	Bump httplog from 1.2.1 to 1.2.2 (#10311 ) Bumps [httplog](https://github.com/trusche/httplog) from 1.2.1 to 1.2.2. - [Release notes](https://github.com/trusche/httplog/releases) - [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md) - [Commits](https://github.com/trusche/httplog/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	aa34899b74	Bump pkg-config from 1.3.6 to 1.3.7 (#10310 ) Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config) from 1.3.6 to 1.3.7. - [Release notes](https://github.com/ruby-gnome2/pkg-config/releases) - [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS) - [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.6...1.3.7) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	eed61a37ec	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.	6 years ago
Yamagishi Kazutoshi	e0e72c90b6	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>	6 years ago
dependabot[bot]	9200afd9e6	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>	6 years ago
dependabot[bot]	8edfcf7b56	Bump oj from 3.7.9 to 3.7.10 (#10278 ) Bumps [oj](https://github.com/ohler55/oj) from 3.7.9 to 3.7.10. - [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.7.9...v3.7.10) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	741766a01d	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.	6 years ago
dependabot[bot]	103278e29a	[Security] Bump rails from 5.2.2 to 5.2.2.1 (#10257 ) Bumps [rails](https://github.com/rails/rails) from 5.2.2 to 5.2.2.1. This update includes security fixes. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.2...v5.2.2.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	d86033c352	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/about_controller.rb - app/controllers/tags_controller.rb - app/views/about/show.html.haml - spec/views/about/show.html.haml_spec.rb	6 years ago
dependabot[bot]	f326de90ef	Bump active_record_query_trace from 1.6.1 to 1.6.2 (#10252 ) Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace) from 1.6.1 to 1.6.2. - [Release notes](https://github.com/brunofacca/active-record-query-trace/releases) - [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/master/HISTORY.md) - [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.6.1...v1.6.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	9c76fab112	Bump concurrent-ruby from 1.1.4 to 1.1.5 (#10242 ) Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby) from 1.1.4 to 1.1.5. - [Release notes](https://github.com/ruby-concurrency/concurrent-ruby/releases) - [Changelog](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/ruby-concurrency/concurrent-ruby/compare/v1.1.4...v1.1.5) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	edd48921c6	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	b80943b08b	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>	6 years ago
dependabot[bot]	5101d1ea41	Bump pkg-config from 1.3.5 to 1.3.6 (#10235 ) Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config) from 1.3.5 to 1.3.6. - [Release notes](https://github.com/ruby-gnome2/pkg-config/releases) - [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS) - [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.5...1.3.6) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	d8d9c9b983	Bump active_record_query_trace from 1.6 to 1.6.1 (#10237 ) Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace) from 1.6 to 1.6.1. - [Release notes](https://github.com/brunofacca/active-record-query-trace/releases) - [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/master/HISTORY.md) - [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.6...v1.6.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	bed7758022	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	51faba7b59	Bump pkg-config from 1.3.4 to 1.3.5 (#10218 ) Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config) from 1.3.4 to 1.3.5. - [Release notes](https://github.com/ruby-gnome2/pkg-config/releases) - [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS) - [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.4...1.3.5) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	d8d8c64965	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	adc68b7a2e	Bump webpush from 0.3.6 to 0.3.7 (#10205 ) Bumps [webpush](https://github.com/zaru/webpush) from 0.3.6 to 0.3.7. - [Release notes](https://github.com/zaru/webpush/releases) - [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md) - [Commits](https://github.com/zaru/webpush/compare/v0.3.6...v0.3.7) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	3ebbc1f017	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	67764e36f9	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>	6 years ago
Thibaut Girka	c0b876f726	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.	6 years ago
dependabot[bot]	e084f9cb17	Bump sidekiq-unique-jobs from 6.0.11 to 6.0.12 (#10132 ) Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.11 to 6.0.12. - [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/v6.0.11...v6.0.12) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	91934eeb74	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	6e16d69267	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>	6 years ago
dependabot[bot]	b8ca907d39	Bump hamlit-rails from 0.2.1 to 0.2.2 (#10124 ) Bumps [hamlit-rails](https://github.com/mfung/hamlit-rails) from 0.2.1 to 0.2.2. - [Release notes](https://github.com/mfung/hamlit-rails/releases) - [Commits](https://github.com/mfung/hamlit-rails/compare/v0.2.1...v0.2.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	76949bc007	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - Dockerfile Took upstream version and reverted `b6d0dcc5d3`. 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.	6 years ago
dependabot[bot]	737ad494c0	Bump hamlit-rails from 0.2.0 to 0.2.1 (#10120 ) Bumps [hamlit-rails](https://github.com/mfung/hamlit-rails) from 0.2.0 to 0.2.1. - [Release notes](https://github.com/mfung/hamlit-rails/releases) - [Commits](https://github.com/mfung/hamlit-rails/compare/v0.2.0...v0.2.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	df7740b1da	Bump bootsnap from 1.4.0 to 1.4.1 (#10118 ) Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.0 to 1.4.1. - [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.4.0...v1.4.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	d98b9c940e	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>	6 years ago
dependabot[bot]	764279edf7	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>	6 years ago
dependabot[bot]	d130f21542	Bump sidekiq-unique-jobs from 6.0.9 to 6.0.11 (#10113 ) Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.9 to 6.0.11. - [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/v6.0.9...v6.0.11) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	7b03dd3db9	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>	6 years ago
Daigo 3 Dango	85c9cdaed0	Upgrade Ruby to 2.6.1 (#9956 )	6 years ago
dependabot[bot]	98c55a5116	Bump pkg-config from 1.3.3 to 1.3.4 (#10081 ) Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config) from 1.3.3 to 1.3.4. - [Release notes](https://github.com/ruby-gnome2/pkg-config/releases) - [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS) - [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.3...1.3.4) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	ac59623c1c	Bump oj from 3.7.8 to 3.7.9 (#10082 ) Bumps [oj](https://github.com/ohler55/oj) from 3.7.8 to 3.7.9. - [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.7.8...v3.7.9) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Thibaut Girka	c8086b6efb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
dependabot[bot]	e45f98c499	Bump better_errors from 2.5.0 to 2.5.1 (#10050 ) Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.5.0 to 2.5.1. - [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.5.0...v2.5.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	a4cfb5c36b	Bump faker from 1.9.2 to 1.9.3 (#10031 ) Bumps [faker](https://github.com/stympy/faker) from 1.9.2 to 1.9.3. - [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.9.2...v1.9.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
dependabot[bot]	ee737fbbd3	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>	6 years ago
dependabot[bot]	222b0095bb	Bump faker from 1.9.1 to 1.9.2 (#10020 ) Bumps [faker](https://github.com/stympy/faker) from 1.9.1 to 1.9.2. - [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.9.1...v1.9.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago

1 2 3 4 5 ...

518 Commits (48224bc11b931c36eac7a2e178bc38bfbe92af66)