diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-05 19:01:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-05 19:01:44 +0200 |
| commit | 515ce8f4697fe7edfdf14c45575a71164b920db9 (patch) | |
| tree | 1211e136ba3e886ee8daaa5200babffc42375dd1 /spec/controllers/api/v1/timelines/public_controller_spec.rb | |
| parent | a9e8f98a9d32c57956d41009bd09a1f33310676e (diff) | |
| parent | 00fcdebed758f031b486ec239fd425fc54a180b3 (diff) | |
Merge pull request #762 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/controllers/api/v1/timelines/public_controller_spec.rb')
| -rw-r--r-- | spec/controllers/api/v1/timelines/public_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/api/v1/timelines/public_controller_spec.rb b/spec/controllers/api/v1/timelines/public_controller_spec.rb index 68d87bbcb..a0f778cdc 100644 --- a/spec/controllers/api/v1/timelines/public_controller_spec.rb +++ b/spec/controllers/api/v1/timelines/public_controller_spec.rb @@ -5,7 +5,7 @@ require 'rails_helper' describe Api::V1::Timelines::PublicController do render_views - let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) } + let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) } before do allow(controller).to receive(:doorkeeper_token) { token } |