diff options
| author | Anthony Bellew <anthonyreflected@gmail.com> | 2017-01-03 11:51:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-03 11:51:35 -0700 |
| commit | de154dbd5dbb04d083f5a66dc288d9fef7006c01 (patch) | |
| tree | 88a1715021c33add55501351dbf74950deeac481 /app/helpers | |
| parent | c3e9ba6a66bfcb9e33edebc73adea0a17d7f02a6 (diff) | |
| parent | e6657d7342ee1ce08973bf1e5ab89e423eb8b760 (diff) | |
Merge pull request #1 from Gargron/master
Catchup merge
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/api/oembed_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/authorize_follow_helper.rb | 4 | ||||
| -rw-r--r-- | app/helpers/follow_requests_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/stream_entries_helper.rb | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/app/helpers/api/oembed_helper.rb b/app/helpers/api/oembed_helper.rb deleted file mode 100644 index 05d5ca216..000000000 --- a/app/helpers/api/oembed_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module Api::OembedHelper -end diff --git a/app/helpers/authorize_follow_helper.rb b/app/helpers/authorize_follow_helper.rb new file mode 100644 index 000000000..99ee03c2f --- /dev/null +++ b/app/helpers/authorize_follow_helper.rb @@ -0,0 +1,4 @@ +# frozen_string_literal: true + +module AuthorizeFollowHelper +end diff --git a/app/helpers/follow_requests_helper.rb b/app/helpers/follow_requests_helper.rb deleted file mode 100644 index cfd350e53..000000000 --- a/app/helpers/follow_requests_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module FollowRequestsHelper -end diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index 5cd65008e..ae2f575b5 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -10,7 +10,7 @@ module StreamEntriesHelper end def avatar_for_status_url(status) - status.reblog? ? status.reblog.account.avatar.url( :original) : status.account.avatar.url( :original) + status.reblog? ? status.reblog.account.avatar.url(:original) : status.account.avatar.url(:original) end def entry_classes(status, is_predecessor, is_successor, include_threads) |