diff options
| author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-12-15 04:16:25 +0400 |
|---|---|---|
| committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-12-20 19:54:28 +0400 |
| commit | 19eb63741995e3be60781db74edab5d5ae896c6b (patch) | |
| tree | 349c2f0d63b4bf89500de1c8c3ee5887dc981e68 /app/workers | |
| parent | b2e46f44ceee2078b8e1d92ae5ff892c044bc0e7 (diff) | |
Update uses of Gitolite.config.foo settings
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/post_receive.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/post_receive.rb b/app/workers/post_receive.rb index 11281b8b656..1414ed490c9 100644 --- a/app/workers/post_receive.rb +++ b/app/workers/post_receive.rb @@ -2,7 +2,7 @@ class PostReceive @queue = :post_receive def self.perform(repo_path, oldrev, newrev, ref, identifier) - repo_path.gsub!(Gitlab.config.git_base_path.to_s, "") + repo_path.gsub!(Gitlab.config.gitolite.repos_path.to_s, "") repo_path.gsub!(/.git$/, "") repo_path.gsub!(/^\//, "") @@ -10,7 +10,7 @@ class PostReceive return false if project.nil? # Ignore push from non-gitlab users - user = if identifier.eql? Gitlab.config.gitolite_admin_key + user = if identifier.eql? Gitlab.config.gitolite.admin_key email = project.commit(newrev).author.email rescue nil User.find_by_email(email) if email elsif /^[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,4}$/.match(identifier) |