# HG changeset patch # User Chris Cannam # Date 1301581426 -3600 # Node ID 8d0e011332effa98c73a8aa65b071a703eaeb826 # Parent a0956f78f39c54661d7d760bc5903a9e7b5eef3c# Parent 1a514b9347d48f02cb64bf4431e7a5219f769611 Merge from branch "feature_122" diff -r 1a514b9347d4 -r 8d0e011332ef app/controllers/files_controller.rb --- a/app/controllers/files_controller.rb Thu Mar 31 15:19:30 2011 +0100 +++ b/app/controllers/files_controller.rb Thu Mar 31 15:23:46 2011 +0100 @@ -8,7 +8,7 @@ include SortHelper def index - sort_init 'active', 'asc' + sort_init 'active', 'desc' sort_update 'filename' => "#{Attachment.table_name}.filename", 'active' => "#{Attachment.table_name}.active", 'created_on' => "#{Attachment.table_name}.created_on", diff -r 1a514b9347d4 -r 8d0e011332ef extra/soundsoftware/reposman-soundsoftware.rb --- a/extra/soundsoftware/reposman-soundsoftware.rb Thu Mar 31 15:19:30 2011 +0100 +++ b/extra/soundsoftware/reposman-soundsoftware.rb Thu Mar 31 15:23:46 2011 +0100 @@ -346,14 +346,5 @@ log("\trepository #{repos_path} created"); end - if project.respond_to?(:repository) and project.repository.is_external? - external_url = project.repository.external_url; - log("\tproject #{project.identifier} has external repository url #{external_url}"); - if !external_url.match(/^https?:/) - # wot about git, svn/svn+ssh, etc? should we just check for a scheme at all? - log("\tthis is not an http(s) url: ignoring"); - end - end - end