Fixed styles, ProjectHook specs etc

2 files changed, 9 insertions, 3 deletions

diff --git a/app/models/commit.rb b/app/models/commit.rb
index a1d89600126..7e64c0f6e82 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -98,6 +98,8 @@ class Commit
   end
 
   def initialize(raw_commit, head = nil)
+    raise "Nil as raw commit passed" unless raw_commit
+
     @commit = raw_commit
     @head = head
   end
@@ -136,7 +138,11 @@ class Commit
   end
 
   def prev_commit
-    parents.try :first
+    @prev_commit ||= if parents.present?
+                       Commit.new(parents.first)
+                     else
+                       nil
+                     end
   end
 
   def prev_commit_id
diff --git a/app/models/project.rb b/app/models/project.rb
index 850653988c9..2204d4a56e5 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -361,8 +361,8 @@ class Project < ActiveRecord::Base
 
     # Discover the default branch, but only if it hasn't already been set to
     # something else
-    if default_branch.nil?
-      update_attributes(default_branch: discover_default_branch)
+    if repository && default_branch.nil?
+      update_attributes(default_branch: self.repository.discover_default_branch)
     end
   end