cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into notes

Browse source 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/helpers/application_helper.rb
This commit is contained in:
Tom Hughes 2012-11-20 19:08:30 +00:00
commit 7599f98957
133 changed files with 4192 additions and 1690 deletions
Download patch file Download diff file Expand all files Collapse all files

5
db/structure.sql
View file

@ -1103,7 +1103,8 @@ CREATE TABLE users (
image_fingerprint character varying(255),
changesets_count integer DEFAULT 0 NOT NULL,
traces_count integer DEFAULT 0 NOT NULL,
diary_entries_count integer DEFAULT 0 NOT NULL
diary_entries_count integer DEFAULT 0 NOT NULL,
image_use_gravatar boolean DEFAULT true NOT NULL
);
@ -2444,6 +2445,8 @@ 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');