kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

code folding fix

Browse source
This commit is contained in:
Valery Sizov 2015-03-16 13:52:45 +02:00
parent 9698b36c1c
commit 09ef69b7c8
5 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/concerns/issuable.rb
View file

@ -134,9 +134,9 @@ module Issuable
end end
def subscribe_status(user) def subscribe_status(user)
sub = subscribes.find_by_user_id(user.id) subscribe = subscribes.find_by_user_id(user.id)
if sub if subscribe
return sub.subscribed return subscribe.subscribed
end end
participants.include?(user) participants.include?(user)

3
app/models/subscribe.rb
View file

@ -1,3 +1,6 @@
class Subscribe < ActiveRecord::Base class Subscribe < ActiveRecord::Base
belongs_to :user belongs_to :user
validates :issue_id, uniqueness: { scope: :user_id, allow_nil: true }
validates :merge_request_id, uniqueness: { scope: :user_id, allow_nil: true }
end end

10
app/services/notification_service.rb
View file

@ -368,16 +368,16 @@ class NotificationService
recipients = reject_muted_users(recipients, project) recipients = reject_muted_users(recipients, project)
recipients = reject_mention_users(recipients, project) recipients = reject_mention_users(recipients, project)
recipients = add_subscribers(recipients, project) recipients = add_subscribed_users(recipients, project)
recipients = recipients.concat(project_watchers(project)).uniq recipients = recipients.concat(project_watchers(project)).uniq
recipients = reject_unsubscribed_users(recipients, target) recipients = reject_unsubscribed_users(recipients, target)
recipients recipients
end end
def add_subscribers(recipients, target) def add_subscribed_users(recipients, target)
subs = target.subscribes subscribes = target.subscribes
if subs.any? if subscribes.any?
recipients.merge(subs.where("subscribed is true").map(&:user)) recipients.merge(subscribes.where("subscribed is true").map(&:user))
else else
recipients recipients
end end

4
db/migrate/20150313012111_create_subscribes_table.rb
View file

@ -8,5 +8,9 @@ class CreateSubscribesTable < ActiveRecord::Migration
t.timestamps t.timestamps
end end
add_index :subscribes, :user_id
add_index :subscribes, :issue_id
add_index :subscribes, :merge_request_id
end end
end end

4
db/schema.rb
View file

@ -406,6 +406,10 @@ ActiveRecord::Schema.define(version: 20150313012111) do
t.datetime "updated_at" t.datetime "updated_at"
end end
add_index "subscribes", ["issue_id"], name: "index_subscribes_on_issue_id", using: :btree
add_index "subscribes", ["merge_request_id"], name: "index_subscribes_on_merge_request_id", using: :btree
add_index "subscribes", ["user_id"], name: "index_subscribes_on_user_id", using: :btree
create_table "taggings", force: true do |t| create_table "taggings", force: true do |t|
t.integer "tag_id" t.integer "tag_id"
t.integer "taggable_id" t.integer "taggable_id"