Project must have namespace for Project#find_with_namespace

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Project must have namespace for Project#find_with_namespace
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets
1 parent 17a9ecf8
Showing 1 changed file with 7 additions and 9 deletions Show diff stats
app/models/project.rb
@@ -177,15 +177,13 @@ class Project &lt; ActiveRecord::Base
     end
  
     def find_with_namespace(id)
-      if id.include?("/")
-        id = id.split("/")
-        namespace = Namespace.find_by(path: id.first)
-        return nil unless namespace
-
-        where(namespace_id: namespace.id).find_by(path: id.second)
-      else
-        where(path: id, namespace_id: nil).last
-      end
+      return nil unless id.include?("/")
+
+      id = id.split("/")
+      namespace = Namespace.find_by(path: id.first)
+      return nil unless namespace
+
+      where(namespace_id: namespace.id).find_by(path: id.second)
     end
  
     def visibility_levels
...	...	@@ -177,15 +177,13 @@ class Project < ActiveRecord::Base
177	177	end
178	178
179	179	def find_with_namespace(id)
180		- if id.include?("/")
181		- id = id.split("/")
182		- namespace = Namespace.find_by(path: id.first)
183		- return nil unless namespace
184		-
185		- where(namespace_id: namespace.id).find_by(path: id.second)
186		- else
187		- where(path: id, namespace_id: nil).last
188		- end
	180	+ return nil unless id.include?("/")
	181	+
	182	+ id = id.split("/")
	183	+ namespace = Namespace.find_by(path: id.first)
	184	+ return nil unless namespace
	185	+
	186	+ where(namespace_id: namespace.id).find_by(path: id.second)
189	187	end
190	188
191	189	def visibility_levels
...	...