You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		7 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
features	rubocop issues - Cleaning up (#8912)	7 years ago
fixtures	Fix undefined method error in sidekiq (#9807)	7 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
lib	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
mailers	Improve e-mail digest (#9689)	7 years ago
models	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
policies	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
presenters	Change instance_presenter_spec to point to glitch-soc instead of tootsuite	7 years ago
requests	Use raw status code on have_http_status (#7214)	8 years ago
routing	…
services	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
support	…
validators	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
views	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
workers	Add scheduled statuses (#9706)	7 years ago
rails_helper.rb	Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers (#9819)	7 years ago
spec_helper.rb	Disable simplecov on CircleCI (#7416)	8 years ago