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

14
db/migrate/20121012044047_add_image_use_gravatar_to_users.rb Normal file
View file

@ -0,0 +1,14 @@
class AddImageUseGravatarToUsers < ActiveRecord::Migration
def self.up
add_column :users, :image_use_gravatar, :boolean, :null => false, :default => false
# For people who don't have images on osm.org, enable Gravatar.
User.where(:image_file_name => nil).update_all(:image_use_gravatar => true)
change_column_default :users, :image_use_gravatar, true
end
def self.down
remove_column :users, :image_use_gravatar
end
end