kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Resolve discussions

This commit is contained in:
Michael Kozono 2017-05-05 10:48:01 -07:00
parent f05469f99b
commit e1c245af51
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/projects/application_controller.rb
View File

@ -21,13 +21,12 @@ class Projects::ApplicationController < ApplicationController
end
def project
@project ||= find_routable!(Project,
File.join(params[:namespace_id], params[:project_id] || params[:id]),
extra_authorization_proc: project_not_being_deleted?)
end
return @project if @project
def project_not_being_deleted?
->(project) { !project.pending_delete? }
path = File.join(params[:namespace_id], params[:project_id] || params[:id])
auth_proc = ->(project) { !project.pending_delete? }
@project = find_routable!(Project, path, extra_authorization_proc: auth_proc)
end
def repository

2
app/models/route.rb
View File

@ -16,7 +16,7 @@ class Route < ActiveRecord::Base
scope :direct_descendant_routes, -> (path) { where('routes.path LIKE ? AND routes.path NOT LIKE ?', "#{sanitize_sql_like(path)}/%", "#{sanitize_sql_like(path)}/%/%") }
def rename_direct_descendant_routes
return if !path_changed? && !name_changed?
return unless path_changed? || name_changed?
direct_descendant_routes = self.class.direct_descendant_routes(path_was)