Prepared for gitolite v3

randx
1 parent 1f5e2658
Showing 5 changed files with 15 additions and 11 deletions Show diff stats
app/models/merge_request.rb
app/roles/push_event.rb
config/gitlab.yml.example
doc/installation.md
lib/gitlab/merge.rb
@@ -162,7 +162,7 @@ class MergeRequest &lt; ActiveRecord::Base
   end
   def automerge!(current_user)
-    if Gitlab::Merge.new(self, current_user).merge
+    if Gitlab::Merge.new(self, current_user).merge && self.unmerged_commits.empty?
       self.merge!(current_user.id)
       true
     end
@@ -90,6 +90,8 @@ module PushEvent
   def push_with_commits? 
     md_ref? && commits.any? && parent_commit && last_commit
+  rescue Grit::NoSuchPathError
+    false
   end
   def last_push_to_non_root?
@@ -33,11 +33,11 @@ app:
 git_host:
   admin_uri: git@localhost:gitolite-admin
   base_path: /home/git/repositories/
-  # hooks_path: /var/lib/gitolite/.gitolite/hooks/ # only needed when gitolite is not installed according the manual
-  # host: localhost
+  hooks_path: /home/git/.gitolite/hooks/
   git_user: git
   upload_pack: true
   receive_pack: true
+  # host: localhost
   # port: 22
 # Git settings
@@ -113,17 +113,20 @@ Generate key:
 Clone GitLab's fork of the Gitolite source code:
     cd /home/git
-    sudo -H -u git git clone https://github.com/gitlabhq/gitolite.git /home/git/gitolite
+    sudo -H -u git git clone -b gl-v304 https://github.com/gitlabhq/gitolite.git /home/git/gitolite
 Setup:
+    cd /home/git
+    sudo -u git -H mkdir bin
     sudo -u git sh -c 'echo -e "PATH=\$PATH:/home/git/bin\nexport PATH" >> /home/git/.profile'
-    sudo -u git -H sh -c "PATH=/home/git/bin:$PATH; /home/git/gitolite/src/gl-system-install"
+    sudo -u git sh -c 'gitolite/install -ln /home/git/bin'
+
     sudo cp /home/gitlab/.ssh/id_rsa.pub /home/git/gitlab.pub
     sudo chmod 0444 /home/git/gitlab.pub
-    sudo -u git -H sed -i 's/0077/0007/g' /home/git/share/gitolite/conf/example.gitolite.rc
-    sudo -u git -H sh -c "PATH=/home/git/bin:$PATH; gl-setup -q /home/git/gitlab.pub"
+    sudo -u git -H sh -c "PATH=/home/git/bin:$PATH; gitolite setup -pk /home/git/gitlab.pub"
+    sudo -u git -H sed -i 's/0077/0007/g' /home/git/.gitolite.rc
 Permissions:
@@ -189,8 +192,8 @@ and ensure you have followed all of the above steps carefully.
 #### Setup GitLab hooks
-    sudo cp ./lib/hooks/post-receive /home/git/share/gitolite/hooks/common/post-receive
-    sudo chown git:git /home/git/share/gitolite/hooks/common/post-receive
+    sudo cp ./lib/hooks/post-receive /home/git/.gitolite/hooks/common/post-receive
+    sudo chown git:git /home/git/.gitolite/hooks/common/post-receive
 #### Check application status
@@ -21,8 +21,7 @@ module Gitlab
         if output =~ /CONFLICT/
           false  
         else 
-          repo.git.push({}, "origin", merge_request.target_branch)
-          true
+          !!repo.git.push({}, "origin", merge_request.target_branch)
         end
       end
     end
	@@ -162,7 +162,7 @@ class MergeRequest < ActiveRecord::Base		@@ -162,7 +162,7 @@ class MergeRequest < ActiveRecord::Base
162	end	162	end
163		163
164	def automerge!(current_user)	164	def automerge!(current_user)
165	- if Gitlab::Merge.new(self, current_user).merge	165	+ if Gitlab::Merge.new(self, current_user).merge && self.unmerged_commits.empty?
166	self.merge!(current_user.id)	166	self.merge!(current_user.id)
167	true	167	true
168	end	168	end
	@@ -90,6 +90,8 @@ module PushEvent		@@ -90,6 +90,8 @@ module PushEvent
90		90
91	def push_with_commits?	91	def push_with_commits?
92	md_ref? && commits.any? && parent_commit && last_commit	92	md_ref? && commits.any? && parent_commit && last_commit
		93	+ rescue Grit::NoSuchPathError
		94	+ false
93	end	95	end
94		96
95	def last_push_to_non_root?	97	def last_push_to_non_root?
	@@ -33,11 +33,11 @@ app:		@@ -33,11 +33,11 @@ app:
33	git_host:	33	git_host:
34	admin_uri: git@localhost:gitolite-admin	34	admin_uri: git@localhost:gitolite-admin
35	base_path: /home/git/repositories/	35	base_path: /home/git/repositories/
36	- # hooks_path: /var/lib/gitolite/.gitolite/hooks/ # only needed when gitolite is not installed according the manual
37	- # host: localhost	36	+ hooks_path: /home/git/.gitolite/hooks/
38	git_user: git	37	git_user: git
39	upload_pack: true	38	upload_pack: true
40	receive_pack: true	39	receive_pack: true
		40	+ # host: localhost
41	# port: 22	41	# port: 22
42		42
43	# Git settings	43	# Git settings