beatrix e7edb4d1ee Merge pull request #87 from tootsuite/master ...

merge upstream

2017-07-20 11:24:32 -04:00

..

controllers

Merge pull request #87 from tootsuite/master

2017-07-20 11:24:32 -04:00

fabricators

Web Push Notifications (#3243)

2017-07-13 22:15:32 +02:00

features

Add scenarios for log in (#3497)

2017-06-01 17:25:59 +02:00

fixtures

Use charlock_holmes instead of nkf at FetchLinkCardService (#4080)

2017-07-08 22:44:31 +02:00

helpers

Improve ActivityPub representations (#3844)

2017-07-15 03:01:39 +02:00

javascript

feat(emoji): Add back title attribute (#4253)

2017-07-18 22:49:24 +02:00

lib

Correct OStatus inflection (Ostatus -> OStatus) (#4255)

2017-07-19 01:37:26 +02:00

mailers

Spec UserMailer (#3757)

2017-06-17 01:15:00 +02:00

models

Merge changes from upstream with the CSS reload fix

2017-07-18 18:58:47 +02:00

policies

Add status destroy authorization to policy (#3453)

2017-05-30 22:56:31 +02:00

presenters

Use around hook to restore context in InstancePresenter spec (#3430)

2017-05-30 09:03:35 -04:00

requests

Redesign the landing page, mount public timeline on it (#4122)

2017-07-11 15:27:59 +02:00

routing

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

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

services

Fix webfinger retries (#4275)

2017-07-20 01:59:07 +02:00

support

Some minor change and spec for Account (#3813)

2017-06-22 18:34:27 +02:00

views

Follow renaming of microformats2 gem (#4203)

2017-07-14 19:57:49 +02:00

workers

Fix webfinger retries (#4275)

2017-07-20 01:59:07 +02:00

rails_helper.rb

Fix #4058 - Use a long-lived cookie to keep track of user-level sessions (#4091)

2017-07-07 23:25:15 +02:00

spec_helper.rb

Add more tests for AtomSerializer (#2096)

2017-04-18 22:30:17 +02:00