Download as
Browse Code »

Commit 806b76a168536ef05b20c5449f19164ea149583f

Authored by Dmitriy Zaporozhets
1 parent 4bf63212
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

rename scope to prevent name collision

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/controllers/public/projects_controller.rb
  Diff comments   View file @806b76a
@@ -6,7 +6,7 @@ class Public::ProjectsController < ApplicationController @@ -6,7 +6,7 @@ class Public::ProjectsController < ApplicationController
6 layout 'public' 6 layout 'public'
7 7
8 def index 8 def index
9 - @projects = Project.public 9 + @projects = Project.public_only
10 @projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page]).per(20) 10 @projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page]).per(20)
11 end 11 end
12 end 12 end
app/models/project.rb
  Diff comments   View file @806b76a
@@ -91,7 +91,7 @@ class Project < ActiveRecord::Base @@ -91,7 +91,7 @@ class Project < ActiveRecord::Base
91 scope :sorted_by_activity, ->() { order("(SELECT max(events.created_at) FROM events WHERE events.project_id = projects.id) DESC") } 91 scope :sorted_by_activity, ->() { order("(SELECT max(events.created_at) FROM events WHERE events.project_id = projects.id) DESC") }
92 scope :personal, ->(user) { where(namespace_id: user.namespace_id) } 92 scope :personal, ->(user) { where(namespace_id: user.namespace_id) }
93 scope :joined, ->(user) { where("namespace_id != ?", user.namespace_id) } 93 scope :joined, ->(user) { where("namespace_id != ?", user.namespace_id) }
94 - scope :public, -> { where(public: true) } 94 + scope :public_only, -> { where(public: true) }
95 95
96 class << self 96 class << self
97 def abandoned 97 def abandoned