Merge branch 'master' into notes

[rails.git] / db / structure.sql

diff --git a/db/structure.sql b/db/structure.sql
index 5c1fa3eea79b0742f98fab4c3bc968480594fba0..84c38c86ef277054fd6adbfd352874b9f4ffa504 100644 (file)
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1102,7 +1102,9 @@ CREATE TABLE users (
     description_format format_enum DEFAULT 'html'::format_enum NOT NULL,
     image_fingerprint character varying(255),
     changesets_count integer DEFAULT 0 NOT NULL,
-    traces_count integer DEFAULT 0 NOT NULL
+    traces_count integer DEFAULT 0 NOT NULL,
+    diary_entries_count integer DEFAULT 0 NOT NULL,
+    image_use_gravatar boolean DEFAULT true NOT NULL
 );
 
 
@@ -2441,6 +2443,10 @@ INSERT INTO schema_migrations (version) VALUES ('20120404205604');
 
 INSERT INTO schema_migrations (version) VALUES ('20120808231205');
 
+INSERT INTO schema_migrations (version) VALUES ('20121005195010');
+
+INSERT INTO schema_migrations (version) VALUES ('20121012044047');
+
 INSERT INTO schema_migrations (version) VALUES ('21');
 
 INSERT INTO schema_migrations (version) VALUES ('22');