Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream

Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file.

app/services/resolve_url_service.rb

@@ -63,7 +63,7 @@ class ResolveURLService < BaseService
   end
 
   def fetch_resource_service
-    @_fetch_resource_service ||= FetchResourceService.new
+    @fetch_resource_service ||= FetchResourceService.new
   end
 
   def resource_url

app/services/search_service.rb

@@ -82,7 +82,7 @@ class SearchService < BaseService
   end
 
   def url_resource
-    @_url_resource ||= ResolveURLService.new.call(@query, on_behalf_of: @account)
+    @url_resource ||= ResolveURLService.new.call(@query, on_behalf_of: @account)
   end
 
   def url_resource_symbol