forked from e621ng/e621ng
fixes #2108, upgrade to postgresql 9.3, fix tests
This commit is contained in:
parent
e46d467f64
commit
7edcbf33dd
4
Gemfile
4
Gemfile
@ -19,11 +19,11 @@ group :assets do
|
||||
end
|
||||
|
||||
gem "rails"
|
||||
gem "pg", "0.12.2"
|
||||
gem "pg"
|
||||
gem "kgio"
|
||||
gem "dalli"
|
||||
gem "delayed_job"
|
||||
gem "delayed_job_active_record", :git => "https://github.com/r888888888/delayed_job_active_record.git", :branch => "postgresql8"
|
||||
gem "delayed_job_active_record"
|
||||
gem "simple_form"
|
||||
gem "mechanize"
|
||||
gem "nokogiri"
|
||||
|
16
Gemfile.lock
16
Gemfile.lock
@ -1,12 +1,3 @@
|
||||
GIT
|
||||
remote: https://github.com/r888888888/delayed_job_active_record.git
|
||||
revision: ed036c188ebc323929a7509a9cebf40466bc0b0d
|
||||
branch: postgresql8
|
||||
specs:
|
||||
delayed_job_active_record (4.0.0)
|
||||
activerecord (>= 3.0, < 4.1)
|
||||
delayed_job (>= 3.0, < 4.1)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/r888888888/ruby-imagespec.git
|
||||
revision: 2dab9811f4abb4fbaeea66feb42e388ba545b2d8
|
||||
@ -69,6 +60,9 @@ GEM
|
||||
dalli (2.6.4)
|
||||
delayed_job (4.0.0)
|
||||
activesupport (>= 3.0, < 4.1)
|
||||
delayed_job_active_record (4.0.0)
|
||||
activerecord (>= 3.0, < 4.1)
|
||||
delayed_job (>= 3.0, < 4.1)
|
||||
diff-lcs (1.2.4)
|
||||
domain_name (0.5.12)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
@ -226,7 +220,7 @@ DEPENDENCIES
|
||||
daemons
|
||||
dalli
|
||||
delayed_job
|
||||
delayed_job_active_record!
|
||||
delayed_job_active_record
|
||||
diff-lcs
|
||||
factory_girl
|
||||
ffaker
|
||||
@ -237,7 +231,7 @@ DEPENDENCIES
|
||||
net-ssh
|
||||
newrelic_rpm
|
||||
nokogiri
|
||||
pg (= 0.12.2)
|
||||
pg
|
||||
pry
|
||||
rails
|
||||
rmagick
|
||||
|
@ -106,7 +106,7 @@ class ForumTopic < ActiveRecord::Base
|
||||
end
|
||||
|
||||
def read_by?(user, read_forum_topic_ids)
|
||||
return true if updated_at < user.last_forum_read_at
|
||||
return true if user.last_forum_read_at && updated_at < user.last_forum_read_at
|
||||
if read_forum_topic_ids.any? {|topic_id, timestamp| id.to_s == topic_id && updated_at.to_i > timestamp.to_i}
|
||||
return false
|
||||
end
|
||||
|
455
db/structure.sql
455
db/structure.sql
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user