ivyl · ebastien · Jan 18, 2013 · Jan 18, 2013 · Jan 18, 2013 · Jan 18, 2013
diff --git a/app/models/gitolite_public_key.rb b/app/models/gitolite_public_key.rb
@@ -1,3 +1,5 @@
+require 'open3'
+
 class GitolitePublicKey < ActiveRecord::Base
   unloadable
   STATUS_ACTIVE = 1

diff --git a/init.rb b/init.rb
@@ -1,4 +1,5 @@
 require 'redmine'
+require_dependency 'project'
 require_dependency 'principal'
 require_dependency 'user'
 
@@ -16,12 +17,15 @@
   url 'https://github.com/ivyl/redmine-gitolite/'
   author_url 'http://ivyl.0xcafe.eu/'
 
-  settings :default => {
-    'gitoliteUrl' => 'gitolite@localhost:gitolite-admin.git',
-    'developerBaseUrls' => "git@example.com:%{name}.git",
-    'readOnlyBaseUrls' => 'http://example.com/git/%{name}',
-    'basePath' => '/home/redmine/repositories/',
-  } 
+  settings({
+    :partial => 'settings/redmine_gitolite',
+    :default => {
+      'gitoliteUrl' => 'gitolite@localhost:gitolite-admin.git',
+      'developerBaseUrls' => "git@example.com:%{name}.git",
+      'readOnlyBaseUrls' => 'http://example.com/git/%{name}',
+      'basePath' => '/home/redmine/repositories/',
+	}
+  })
 end
 
 # initialize hook

diff --git a/lib/gitolite_redmine.rb b/lib/gitolite_redmine.rb
@@ -59,7 +59,7 @@ def clone(origin, local_dir)
     end
 
     def lock
-      lockfile_path = File.join(RAILS_ROOT,"tmp",'redmine_gitolite_lock')
+      lockfile_path = File.join(::Rails.root,"tmp",'redmine_gitolite_lock')
       @lockfile = File.new(lockfile_path, File::CREAT|File::RDONLY)
       retries = 5
       while (retries -= 1) > 0