Fix some specs

4 files changed, 4 insertions, 11 deletions

diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb
index ae1de06b983..8b212225b2d 100644
--- a/app/controllers/admin/projects_controller.rb
+++ b/app/controllers/admin/projects_controller.rb
@@ -1,7 +1,6 @@
 class Admin::ProjectsController < Admin::ApplicationController
   before_action :project, only: [:show, :transfer]
   before_action :group, only: [:show, :transfer]
-  before_action :repository, only: [:show, :transfer]
 
   def index
     @projects = Project.all
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb
index 276f80f800a..9c8433c260b 100644
--- a/app/controllers/projects/application_controller.rb
+++ b/app/controllers/projects/application_controller.rb
@@ -67,7 +67,7 @@ class Projects::ApplicationController < ApplicationController
   end
 
   def require_non_empty_project
-    redirect_to @project if @project.empty_repo?
+    redirect_to namespace_project_path(@project.namespace, @project) if @project.empty_repo?
   end
 
   def require_branch_head
diff --git a/app/models/project.rb b/app/models/project.rb
index ab31a635a82..76dcff80bff 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -246,10 +246,6 @@ class Project < ActiveRecord::Base
   end
 
   class << self
-    def public_and_internal_levels
-      [Project::PUBLIC, Project::INTERNAL]
-    end
-
     def abandoned
       where('projects.last_activity_at < ?', 6.months.ago)
     end
@@ -976,11 +972,9 @@ class Project < ActiveRecord::Base
   end
 
   def visibility_level_allowed_as_fork?(level = self.visibility_level)
-    return true unless forked? && forked_project_link.forked_from_project_id.present?
+    return true unless forked?
 
-    from_project = self.forked_from_project
-    from_project ||= Project.find(forked_project_link.forked_from_project_id)
-    Gitlab::VisibilityLevel.allowed_fork_levels(from_project.visibility_level).include?(level)
+    Gitlab::VisibilityLevel.allowed_fork_levels(forked_from_project.visibility_level).include?(level)
   end
 
   def visibility_level_allowed_by_group?(level = self.visibility_level)
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml
index e9e16a7646f..c994e3b997d 100644
--- a/app/views/events/event/_common.html.haml
+++ b/app/views/events/event/_common.html.haml
@@ -4,7 +4,7 @@
     = event_action_name(event)
 
   - if event.target
-    %strong= link_to event.target.to_reference, [event.project.namespace.becomes(Namespace), event.project, event.target]
+    %strong= link_to event.target.reference_link_text, [event.project.namespace.becomes(Namespace), event.project, event.target]
 
   = event_preposition(event)