diff --git a/app/controllers/blame_controller.rb b/app/controllers/blame_controller.rb
index dd0837ea9ab59dede74979efde51c9840b884406..e3fb69b5f6b70f3754cc46733798796435e8e007 100644
--- a/app/controllers/blame_controller.rb
+++ b/app/controllers/blame_controller.rb
@@ -1,13 +1,8 @@
 # Controller for viewing a file's blame
-class BlameController < ApplicationController
+class BlameController < ProjectController
   include ExtractsPath
 
-  layout "project"
-
-  before_filter :project
-
   # Authorize
-  before_filter :add_project_abilities
   before_filter :authorize_read_project!
   before_filter :authorize_code_access!
   before_filter :require_non_empty_project
diff --git a/app/controllers/blob_controller.rb b/app/controllers/blob_controller.rb
index 33387842ec2b5411c986fc006b95583b936b33a4..30c704f22aedf32520162ad3cab3a6bd2b3e2235 100644
--- a/app/controllers/blob_controller.rb
+++ b/app/controllers/blob_controller.rb
@@ -1,14 +1,9 @@
 # Controller for viewing a file's blame
-class BlobController < ApplicationController
+class BlobController < ProjectController
   include ExtractsPath
   include Gitlab::Encode
 
-  layout "project"
-
-  before_filter :project
-
   # Authorize
-  before_filter :add_project_abilities
   before_filter :authorize_read_project!
   before_filter :authorize_code_access!
   before_filter :require_non_empty_project
diff --git a/app/controllers/commit_controller.rb b/app/controllers/commit_controller.rb
index de0d5b2ee7d078271dc3b36cf40b5eb30472aef7..3e1595f169fe02129da17b9d1cd72566b3da15da 100644
--- a/app/controllers/commit_controller.rb
+++ b/app/controllers/commit_controller.rb
@@ -1,12 +1,8 @@
 # Controller for a specific Commit
 #
 # Not to be confused with CommitsController, plural.
-class CommitController < ApplicationController
-  before_filter :project
-  layout "project"
-
+class CommitController < ProjectController
   # Authorize
-  before_filter :add_project_abilities
   before_filter :authorize_read_project!
   before_filter :authorize_code_access!
   before_filter :require_non_empty_project
diff --git a/app/controllers/compare_controller.rb b/app/controllers/compare_controller.rb
index 62f968fd1ed41cc7b8e2d893a8e82489ec059244..96c5c7e1b01a8c00eca4567fd9cb50c1515e145e 100644
--- a/app/controllers/compare_controller.rb
+++ b/app/controllers/compare_controller.rb
@@ -1,9 +1,5 @@
-class CompareController < ApplicationController
-  before_filter :project
-  layout "project"
-
+class CompareController < ProjectController
   # Authorize
-  before_filter :add_project_abilities
   before_filter :authorize_read_project!
   before_filter :authorize_code_access!
   before_filter :require_non_empty_project
diff --git a/app/controllers/tree_controller.rb b/app/controllers/tree_controller.rb
index e6313783d6ef5b1aa39dac8afd7c7c3cd1bd7ed1..4d5c409d42c4af8aeaacef795041e2ca703a0291 100644
--- a/app/controllers/tree_controller.rb
+++ b/app/controllers/tree_controller.rb
@@ -1,13 +1,8 @@
 # Controller for viewing a repository's file structure
-class TreeController < ApplicationController
+class TreeController < ProjectController
   include ExtractsPath
 
-  layout "project"
-
-  before_filter :project
-
   # Authorize
-  before_filter :add_project_abilities
   before_filter :authorize_read_project!
   before_filter :authorize_code_access!
   before_filter :require_non_empty_project