Merge branch 'rs-spec-failure' into 'master'

Fix spec failure introduced by 9d03bc6fa3

See merge request !2006

spec/helpers/application_helper_spec.rb

@@ -278,7 +278,7 @@ describe ApplicationHelper do
       el = element.next_element
 
       expect(el.name).to eq 'script'
-      expect(el.text).to include "$('.js-timeago').timeago()"
+      expect(el.text).to include "$('.js-timeago').last().timeago()"
     end
 
     it 'allows the script tag to be excluded' do