# HG changeset patch # User Chris Cannam # Date 1301647045 -3600 # Node ID 9ccc63655a21c92634cd69af2241ccbb6da7fcf9 # Parent c46fbe5d58ce1df2458a0a0d440dd641127407aa# Parent 8c804ce943db3932b65032fa9b62d18947de66b2 Merge from branch "feature_123" diff -r 8c804ce943db -r 9ccc63655a21 app/controllers/files_controller.rb --- a/app/controllers/files_controller.rb Fri Apr 01 09:37:51 2011 +0100 +++ b/app/controllers/files_controller.rb Fri Apr 01 09:37:25 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 8c804ce943db -r 9ccc63655a21 extra/soundsoftware/reposman-soundsoftware.rb --- a/extra/soundsoftware/reposman-soundsoftware.rb Fri Apr 01 09:37:51 2011 +0100 +++ b/extra/soundsoftware/reposman-soundsoftware.rb Fri Apr 01 09:37:25 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