249991c498
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml
2019-07-19 18:26:49 +02:00
b851456139
Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` ( #11247 )
2019-07-07 16:16:51 +02:00
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
1f98eae1cf
Lint pass ( #8876 )
2018-10-04 12:36:53 +02:00
246c313d45
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/application_controller.rb
Changed instance theme selection by instance flavour selection.
2018-08-24 15:10:34 +02:00
6cb3514d64
Add ability to change an instance default theme from the administration panel ( #7092 ) ( #8381 )
...
* Add default_settings class method to ScopedSettings
ScopedSettings was extended to use value of unscoped setting instead of
only using defaults set in config/settings.yml for selected settings.
This adds possibility for admins to set default values of users' settings,
for example default theme (as requested in #7092 ).
* Add ability to change an instance default theme
Closes #7092
2018-08-23 14:17:35 +02:00
d10447c3a8
Use raw status code on have_http_status ( #7214 )
2018-04-21 21:35:07 +02:00
2e59751823
Improve require_admin! and require_staff! filters ( #7018 )
...
Previously these returns 302 redirects instead of 403s, which meant posting links to admin pages in slack caused them to unfurl, rather than stay as a link. Additionally, require_admin! doesn't appear to be actively used, on require_staff!
2018-04-03 13:07:32 +02:00
1d92b90be9
Fix force_ssl conditional ( #6201 )
2018-01-07 15:19:23 +01:00
0f1b1d78b1
Use "match_array" only for order independent assertions ( #3626 )
2017-06-07 12:59:28 -04:00
10768aa204
Spec response for forgery ( #3248 )
...
Remove protect_from_forgery in ApiController, which is disabled by the
following skip_before_action, as well.
2017-06-01 20:56:55 +02:00
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
bda7391221
Cover ApplicationController more in spec ( #3230 )
2017-05-22 17:58:57 +02:00
aa662cecad
single_user_mode? always returns boolean ( #3215 )
...
This change also adds a specification for the method.
2017-05-22 06:00:06 +02:00
Thibaut Girka