Merge branch 'master' of https://github.com/r888888888/danbooru
This commit is contained in:
@@ -45,7 +45,7 @@ class PostFlag < ActiveRecord::Base
|
||||
|
||||
if params[:is_resolved] == "true"
|
||||
q = q.resolved
|
||||
elsif params[is_resolved] == "false"
|
||||
elsif params[:is_resolved] == "false"
|
||||
q = q.unresolved
|
||||
end
|
||||
|
||||
|
||||
@@ -2096,7 +2096,8 @@ CREATE TABLE pools (
|
||||
post_count integer DEFAULT 0 NOT NULL,
|
||||
is_deleted boolean DEFAULT false NOT NULL,
|
||||
created_at timestamp without time zone NOT NULL,
|
||||
updated_at timestamp without time zone NOT NULL
|
||||
updated_at timestamp without time zone NOT NULL,
|
||||
category character varying(255) DEFAULT 'series'::character varying NOT NULL
|
||||
);
|
||||
|
||||
|
||||
@@ -6412,4 +6413,6 @@ INSERT INTO schema_migrations (version) VALUES ('20130409191950');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20130417221643');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20130424121410');
|
||||
INSERT INTO schema_migrations (version) VALUES ('20130424121410');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20130506154136');
|
||||
Reference in New Issue
Block a user