Commit 806b76a1 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

rename scope to prevent name collision

parent cefe12a2983a
......@@ -6,7 +6,7 @@ class Public::ProjectsController < ApplicationController
layout 'public'
def index
@projects = Project.public
@projects = Project.public_only
@projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page]).per(20)
end
end
......@@ -91,7 +91,7 @@ class TransferError < StandardError; end
scope :sorted_by_activity, ->() { order("(SELECT max(events.created_at) FROM events WHERE events.project_id = projects.id) DESC") }
scope :personal, ->(user) { where(namespace_id: user.namespace_id) }
scope :joined, ->(user) { where("namespace_id != ?", user.namespace_id) }
scope :public, -> { where(public: true) }
scope :public_only, -> { where(public: true) }
class << self
def abandoned
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment