changeset 85:22c68d60853d cannam

Merge from branch "live"

--- a/app/controllers/application_controller.rb	Thu Dec 16 10:03:20 2010 +0000
+++ b/app/controllers/application_controller.rb	Thu Dec 16 10:07:06 2010 +0000
@@ -314,7 +314,7 @@
     if api_request?
       logger.error "Form authenticity token is missing or is invalid. API calls must include a proper Content-type header (text/xml or text/json)."
     end
-    render_error "Invalid form authenticity token."
+    render_error "Invalid form authenticity token.  Perhaps your session has timed out; try reloading the form and entering your details again."
   end
   
   def render_feed(items, options={})    

--- a/app/views/repositories/_dir_list_content.rhtml	Thu Dec 16 10:03:20 2010 +0000
+++ b/app/views/repositories/_dir_list_content.rhtml	Thu Dec 16 10:07:06 2010 +0000
@@ -16,7 +16,7 @@
           :class => (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(entry.name)}")%>
 </td>
 <td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
-<% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %>
+<% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier.to_s) if entry.lastrev && entry.lastrev.identifier %>
 <td class="revision"><%= link_to_revision(changeset, @project) if changeset %></td>
 <td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
 <td class="author"><%= changeset.nil? ? h(entry.lastrev.author.to_s.split('<').first) : changeset.author if entry.lastrev %></td>

--- a/extra/svn/reposman-soundsoftware.rb	Thu Dec 16 10:03:20 2010 +0000
+++ b/extra/svn/reposman-soundsoftware.rb	Thu Dec 16 10:07:06 2010 +0000
@@ -214,7 +214,7 @@
     yield if block_given?
   else
     uid, gid = Etc.getpwnam($svn_owner).uid, ($use_groupid ? Etc.getgrnam(project.identifier).gid : Etc.getgrnam($svn_group).gid)
-    right = project.is_public ? 0775 : 0770
+    right = project.is_public ? 02775 : 02770
     yield if block_given?
     Find.find(repos_path) do |f|
       File.chmod right, f
@@ -313,7 +313,11 @@
       next
     end
 
-    project.is_public ? File.umask(0002) : File.umask(0007)
+# No -- we need "other" users to be able to read it.  Access control
+# is not handled through Unix user id anyway
+#    project.is_public ? File.umask(0002) : File.umask(0007)
+    File.umask(0002)
+
     log("\taction: create repository #{repos_path}")
 
     begin

--- a/lib/redmine/info.rb	Thu Dec 16 10:03:20 2010 +0000
+++ b/lib/redmine/info.rb	Thu Dec 16 10:07:06 2010 +0000
@@ -3,7 +3,7 @@
     class << self
       def app_name; 'Redmine' end
       def url; 'http://www.redmine.org/' end
-      def help_url; 'http://www.redmine.org/guide' end
+      def help_url; '/projects/soundsoftware-site/wiki/Help' end
       def versioned_name; "#{app_name} #{Redmine::VERSION}" end
 
       # Creates the url string to a specific Redmine issue