diff options
| author | Ilyaaaaaaaaaaaaa Zhitomirskiy <ilya@joindiaspora.com> | 2011-07-20 02:04:34 +0400 |
|---|---|---|
| committer | Raphael Sofaer <raphael@joindiaspora.com> | 2011-07-22 05:23:33 +0400 |
| commit | bd1c8efe54f44083cbe81a04633621225ad4d43b (patch) | |
| tree | fd66221bc1d0008ad3690cdf25d1e7b740968fb1 /app | |
| parent | 2d6f51f68c43653bb761933241f16acebc8f4956 (diff) | |
wip integration servers
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/app_config.rb | 2 | ||||
| -rw-r--r-- | app/models/retraction.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/models/app_config.rb b/app/models/app_config.rb index 573b63567..e3aea84cb 100644 --- a/app/models/app_config.rb +++ b/app/models/app_config.rb @@ -6,7 +6,7 @@ require 'uri' class AppConfig < Settingslogic def self.source_file_name - if Rails.env == 'test' || ENV["CI"] + if Rails.env == 'test' || ENV["CI"] || Rails.env.include?("integration") File.join(Rails.root, "config", "application.yml.example") else File.join(Rails.root, "config", "application.yml") diff --git a/app/models/retraction.rb b/app/models/retraction.rb index e0f3ce63d..8b95aae7d 100644 --- a/app/models/retraction.rb +++ b/app/models/retraction.rb @@ -15,6 +15,8 @@ class Retraction def subscribers(user) unless self.type == 'Person' @subscribers ||= self.object.subscribers(user) + @subscribers -= self.object.resharers + @subscribers else raise 'HAX: you must set the subscribers manaully before unfriending' if @subscribers.nil? @subscribers |