From 2a62aa45cd85f46148e9b5ebcaeaddcff06265e2 Mon Sep 17 00:00:00 2001 From: Jeroen van Baarsen Date: Mon, 9 Dec 2013 19:29:39 +0100 Subject: [PATCH] Fixed some deprecation warnings --- app/models/project.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/project.rb b/app/models/project.rb index 1972be2ca..48fa2f661 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -42,10 +42,10 @@ class Project < ActiveRecord::Base # Relations belongs_to :creator, foreign_key: "creator_id", class_name: "User" - belongs_to :group, foreign_key: "namespace_id", conditions: "type = 'Group'" + belongs_to :group, -> { where(type: Group) }, foreign_key: "namespace_id" belongs_to :namespace - has_one :last_event, class_name: 'Event', order: 'events.created_at DESC', foreign_key: 'project_id' + has_one :last_event, -> {order 'events.created_at DESC'}, class_name: 'Event', foreign_key: 'project_id' has_one :gitlab_ci_service, dependent: :destroy has_one :campfire_service, dependent: :destroy has_one :pivotaltracker_service, dependent: :destroy @@ -59,7 +59,7 @@ class Project < ActiveRecord::Base has_many :events, dependent: :destroy has_many :merge_requests, dependent: :destroy, foreign_key: "target_project_id" has_many :fork_merge_requests,dependent: :destroy, foreign_key: "source_project_id", class_name: MergeRequest - has_many :issues, dependent: :destroy, order: "state DESC, created_at DESC" + has_many :issues, -> { order "state DESC, created_at DESC" }, dependent: :destroy has_many :milestones, dependent: :destroy has_many :notes, dependent: :destroy has_many :snippets, dependent: :destroy, class_name: "ProjectSnippet" -- 2.11.0