Merge branch 'rails41'

2014-07-21 08:53:44 +01:00 · 2014-07-21 08:53:44 +01:00 · c53db246f6
commit c53db246f6
parent 212e7153d8 e9fa0055a5
29 changed files with 248 additions and 209 deletions
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@ -92,7 +92,7 @@ private
  ]

  def icon_tags(object)
-    object.tags.find_all { |k,v| ICON_TAGS.include? k }
+    object.tags.find_all { |k,v| ICON_TAGS.include? k }.sort
  end

  def wiki_link(type, lookup)