Thibaut Girka 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb

2019-06-07 17:00:36 +02:00

..

controllers

Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream

2019-06-04 20:40:19 +02:00

fabricators

Merge branch 'master' into glitch-soc/merge-upstream

2019-05-15 17:11:40 +02:00

features

rubocop issues - Cleaning up (#8912)

2018-10-08 04:50:11 +02:00

fixtures

Export and import show_reblogs together with following list (#10495)

2019-04-08 07:28:27 +02:00

helpers

Merge branch 'master' into glitch-soc/merge-upstream

2019-03-16 14:14:20 +01:00

lib

Merge branch 'master' into glitch-soc/merge-upstream

2019-06-07 17:00:36 +02:00

mailers

Add invite request to pending account notification e-mail (#10528)

2019-04-10 00:36:01 +02:00

models

Update remote bio test from 160 to 500 (#10799)

2019-05-21 13:29:06 +02:00

policies

Merge branch 'master' into glitch-soc/merge-upstream

2019-01-10 21:00:30 +01:00

presenters

Merge branch 'master' into glitch-soc/merge-upstream

2019-03-14 17:17:20 +01:00

requests

Redesign landing page (#10232)

2019-03-12 17:34:00 +01:00

routing

Move create/destroy actions for api/v1/statuses to namespace (#3678)

2017-06-10 09:39:26 +02:00

serializers/activitypub

Improved remote thread fetching (#10106)

2019-02-28 15:22:21 +01:00

services

Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream

2019-06-03 14:54:30 +02:00

support

Remove empty strings (#5732)

2017-11-17 10:52:30 +09:00

validators

Merge branch 'master' into glitch-soc/merge-upstream

2019-05-19 21:53:44 +02:00

views

Merge branch 'master' into glitch-soc/merge-upstream

2019-03-13 15:16:02 +01:00

workers

Improved remote thread fetching (#10106)

2019-02-28 15:22:21 +01:00

rails_helper.rb

Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers (#9819)

2019-01-15 23:11:46 +01:00

spec_helper.rb

Disable simplecov on CircleCI (#7416)

2018-05-09 16:59:58 +02:00