diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-02-05 20:15:32 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-02-05 20:15:32 +0100 |
| commit | 170ca8435a6b881231476b372122cf7e5b028736 (patch) | |
| tree | b3c762ef01268462b0b674b2d7f353e2a3a6cf48 /app/models | |
| parent | a7c441aa17ba64eb702b583ac9198cdace599d2e (diff) | |
| parent | 3a98279243e7a49a334c7eb6f806cd2b2072fbed (diff) | |
| download | gitlab-ce-170ca8435a6b881231476b372122cf7e5b028736.tar.gz | |
Merge branch 'master' into ci-permissions
# Conflicts:
# db/schema.rb
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/event.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/event.rb b/app/models/event.rb index 4be23a1cf72..9a0bbf50f8b 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -49,7 +49,7 @@ class Event < ActiveRecord::Base scope :code_push, -> { where(action: PUSHED) } scope :in_projects, ->(projects) do - where(project_id: projects.select(:id).reorder(nil)).recent + where(project_id: projects.map(&:id)).recent end scope :with_associations, -> { includes(project: :namespace) } |