Download as
Browse Code »

Commit 2a62aa45cd85f46148e9b5ebcaeaddcff06265e2

Authored by Jeroen van Baarsen
Committed by Dmitriy Zaporozhets
1 parent e5affcf1
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fixed some deprecation warnings

Showing 1 changed file with 3 additions and 3 deletions   Show diff stats
app/models/project.rb
  Diff comments   View file @2a62aa4
... ... @@ -42,10 +42,10 @@ class Project < ActiveRecord::Base
42 42  
43 43 # Relations
44 44 belongs_to :creator, foreign_key: "creator_id", class_name: "User"
45   - belongs_to :group, foreign_key: "namespace_id", conditions: "type = 'Group'"
  45 + belongs_to :group, -> { where(type: Group) }, foreign_key: "namespace_id"
46 46 belongs_to :namespace
47 47  
48   - has_one :last_event, class_name: 'Event', order: 'events.created_at DESC', foreign_key: 'project_id'
  48 + has_one :last_event, -> {order 'events.created_at DESC'}, class_name: 'Event', foreign_key: 'project_id'
49 49 has_one :gitlab_ci_service, dependent: :destroy
50 50 has_one :campfire_service, dependent: :destroy
51 51 has_one :pivotaltracker_service, dependent: :destroy
... ... @@ -59,7 +59,7 @@ class Project < ActiveRecord::Base
59 59 has_many :events, dependent: :destroy
60 60 has_many :merge_requests, dependent: :destroy, foreign_key: "target_project_id"
61 61 has_many :fork_merge_requests,dependent: :destroy, foreign_key: "source_project_id", class_name: MergeRequest
62   - has_many :issues, dependent: :destroy, order: "state DESC, created_at DESC"
  62 + has_many :issues, -> { order "state DESC, created_at DESC" }, dependent: :destroy
63 63 has_many :milestones, dependent: :destroy
64 64 has_many :notes, dependent: :destroy
65 65 has_many :snippets, dependent: :destroy, class_name: "ProjectSnippet"
... ...