changeset 1614:96bcc0ebd102 live

Merge from branch deploy
author Chris Cannam
date Tue, 05 Sep 2017 11:19:50 +0100
parents bc47b68a9487 (diff) 90bed4e10cc8 (current diff)
children be8eb1d8201b
files
diffstat 1 files changed, 11 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/lib/redmine/version.rb	Wed Aug 30 17:24:37 2017 +0100
+++ b/lib/redmine/version.rb	Tue Sep 05 11:19:50 2017 +0100
@@ -14,17 +14,18 @@
 
     # Retrieves the revision from the working copy
     def self.revision
-      if File.directory?(File.join(Rails.root, '.svn'))
-        begin
-          path = Redmine::Scm::Adapters::AbstractAdapter.shell_quote(Rails.root.to_s)
-          if `svn info --xml #{path}` =~ /revision="(\d+)"/
-            return $1.to_i
-          end
-        rescue
+      return 0
+   #   if File.directory?(File.join(Rails.root, '.svn'))
+   #     begin
+   #       path = Redmine::Scm::Adapters::AbstractAdapter.shell_quote(Rails.root.to_s)
+   #       if `svn info --xml #{path}` =~ /revision="(\d+)"/
+   #         return $1.to_i
+   #       end
+   #     rescue
           # Could not find the current revision
-        end
-      end
-      nil
+   #     end
+   #   end
+   #   nil
     end
 
     REVISION = self.revision