Download as
Browse Code »

Commit a162ccff02711813a78768d01dfc89c79024a103

Authored by Rodrigo Souto
1 parent b2a0c431
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Fixing html_safe and only starting server on tests run

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/helpers/search_helper.rb
  Diff comments   View file @a162ccf
@@ -95,7 +95,7 @@ module SearchHelper @@ -95,7 +95,7 @@ module SearchHelper
95 map_link = display?(asset, :map) ? (display == 'map' ? _('Map') : link_to(_('Map'), params.merge(:display => 'map'))) : nil 95 map_link = display?(asset, :map) ? (display == 'map' ? _('Map') : link_to(_('Map'), params.merge(:display => 'map'))) : nil
96 full_link = display?(asset, :full) ? (display == 'full' ? _('Full') : link_to(_('Full'), params.merge(:display => 'full'))) : nil 96 full_link = display?(asset, :full) ? (display == 'full' ? _('Full') : link_to(_('Full'), params.merge(:display => 'full'))) : nil
97 content_tag('div', 97 content_tag('div',
98 - content_tag('strong', _('Display')) + ': ' + [compact_link, map_link, full_link].compact.join(' | '), 98 + content_tag('strong', _('Display')) + ': ' + [compact_link, map_link, full_link].compact.join(' | ').html_safe,
99 :class => 'search-customize-options' 99 :class => 'search-customize-options'
100 ) 100 )
101 end 101 end
plugins/solr/test/test_solr_helper.rb
  Diff comments   View file @a162ccf
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 # FIXME Not working properly... 2 # FIXME Not working properly...
3 if not $test_helper_loaded 3 if not $test_helper_loaded
4 abort unless system 'rake -s solr:start' 4 abort unless system 'rake -s solr:start'
5 - at_exit { system 'rake -s solr:stop' } 5 +# at_exit { system 'rake -s solr:stop' }
6 $test_helper_loaded = true 6 $test_helper_loaded = true
7 end 7 end
8 8