Merge remote-tracking branch 'origin/master' into gs-master

2017-11-16 22:52:37 -06:00
parent ee560abdbe dc6e031364
commit b28b405b97
29 changed files with 136 additions and 72 deletions
--- a/spec/helpers/stream_entries_helper_spec.rb
+++ b/spec/helpers/stream_entries_helper_spec.rb
@ -77,7 +77,7 @@ RSpec.describe StreamEntriesHelper, type: :helper do
    params[:controller] = StreamEntriesHelper::EMBEDDED_CONTROLLER
    params[:action] = StreamEntriesHelper::EMBEDDED_ACTION
  end
-  
+
  describe '#style_classes' do
    it do
      status = double(reblog?: false)
@ -202,7 +202,7 @@ RSpec.describe StreamEntriesHelper, type: :helper do
      expect(css_class).to eq 'h-cite'
    end
  end
-  
+
  describe '#rtl?' do
    it 'is false if text is empty' do
      expect(helper).not_to be_rtl ''