Tom Hughes 16cbc2eb79 Merge remote-tracking branch 'upstream/pull/2267'		2019-06-20 19:02:31 +01:00
..
abilities	Merge remote-tracking branch 'upstream/pull/2226'	2019-06-18 21:10:07 +01:00
assets	Pass through photo_overlay parameter	2019-06-17 17:26:24 -04:00
controllers	Pass the models, not the ids, when dealing with friendships	2019-06-19 16:56:31 +02:00
helpers	Allow user_blocks to be created for longer periods	2019-05-15 11:30:28 +02:00
jobs	Fix new rubocop warnings	2019-04-23 09:33:34 +01:00
mailers	Move all settings to settings.yml	2019-03-13 18:06:23 +01:00
models	Pass the models, not the ids, when dealing with friendships	2019-06-19 16:56:31 +02:00
validators	Move utf8 validator into app/validators	2019-02-06 12:11:44 +01:00
views	Rename user.friend_users to user.friends	2019-06-19 16:51:35 +02:00