Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.

2018-12-23 11:28:28 +01:00

..

controllers

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

2018-12-23 11:28:28 +01:00

fabricators

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

2018-12-23 11:28:28 +01:00

features

rubocop issues - Cleaning up (#8912)

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

fixtures

Ignore low-confidence CharlockHolmes guesses when parsing link cards (#9510)

2018-12-17 19:19:45 +01:00

helpers

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

2018-12-09 16:08:04 +01:00

lib

Add specs for list replies policy

2018-11-28 14:46:07 +01:00

mailers

Add moderation warnings (#9519)

2018-12-22 20:02:09 +01:00

models

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

2018-12-23 11:28:28 +01:00

policies

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

2018-12-23 11:28:28 +01:00

presenters

Add specs for InstancePresenter (#9596)

2018-12-21 08:59:56 +01:00

requests

Use raw status code on have_http_status (#7214)

2018-04-21 21:35:07 +02:00

routing

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

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

services

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

2018-12-18 16:55:15 +01:00

support

Remove empty strings (#5732)

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

validators

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

2018-12-15 10:45:53 +01:00

views

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

2018-10-08 13:51:33 +02:00

workers

Lists (#5703)

2017-11-18 00:16:48 +01:00

rails_helper.rb

rubocop issues - Cleaning up (#8912)

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

spec_helper.rb

Disable simplecov on CircleCI (#7416)

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