git.openstreetmap.org Git - rails.git/commit

]> git.openstreetmap.org Git - rails.git/commit

Merge 12304:14009 from trunk.

26 files changed:

app/controllers/api_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/user_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/user_preference_controller.rb	diff1 \|	diff2 \|	blob \| history
app/models/changeset.rb	diff1 \|	\|	blob \| history
app/models/node.rb	diff1 \|	diff2 \|	blob \| history
app/models/relation.rb	diff1 \|	diff2 \|	blob \| history
app/models/way.rb	diff1 \|	diff2 \|	blob \| history
app/views/diary_entry/list.rhtml	diff1 \|	diff2 \|	blob \| history
app/views/layouts/site.rhtml	diff1 \|	diff2 \|	blob \| history
app/views/user/login.rhtml	diff1 \|	diff2 \|	blob \| history
app/views/user/new.rhtml	diff1 \|	diff2 \|	blob \| history
config/environment.rb	diff1 \|	diff2 \|	blob \| history
config/initializers/libxml.rb	diff1 \|	diff2 \|	blob \| history
db/migrate/019_add_timestamp_indexes.rb	diff1 \|	\|	blob \| history
db/migrate/020_populate_node_tags_and_remove.rb	diff1 \|	\|	blob \| history
db/migrate/020_populate_node_tags_and_remove_helper.c	diff1 \|	\|	blob \| history
db/migrate/021_move_to_innodb.rb	diff1 \|	\|	blob \| history
db/migrate/022_key_constraints.rb	diff1 \|	\|	blob \| history
db/migrate/023_add_changesets.rb	diff1 \|	\|	blob \| history
db/migrate/024_order_relation_members.rb	diff1 \|	\|	blob \| history
db/migrate/025_add_end_time_to_changesets.rb	diff1 \|	\|	blob \| history
lib/diff_reader.rb	diff1 \|	\|	blob \| history
lib/osm.rb	diff1 \|	diff2 \|	blob \| history
public/stylesheets/site.css	diff1 \|	diff2 \|	blob \| history
test/functional/node_controller_test.rb	diff1 \|	diff2 \|	blob \| history
test/functional/relation_controller_test.rb	diff1 \|	diff2 \|	blob \| history

The OpenStreetMap web site

app/controllers/api_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/user_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/user_preference_controller.rb	diff1 \|	diff2 \|	blob \| history
app/models/changeset.rb	diff1 \|	\|	blob \| history
app/models/node.rb	diff1 \|	diff2 \|	blob \| history
app/models/relation.rb	diff1 \|	diff2 \|	blob \| history
app/models/way.rb	diff1 \|	diff2 \|	blob \| history
app/views/diary_entry/list.rhtml	diff1 \|	diff2 \|	blob \| history
app/views/layouts/site.rhtml	diff1 \|	diff2 \|	blob \| history
app/views/user/login.rhtml	diff1 \|	diff2 \|	blob \| history
app/views/user/new.rhtml	diff1 \|	diff2 \|	blob \| history
config/environment.rb	diff1 \|	diff2 \|	blob \| history
config/initializers/libxml.rb	diff1 \|	diff2 \|	blob \| history
db/migrate/019_add_timestamp_indexes.rb	diff1 \|	\|	blob \| history
db/migrate/020_populate_node_tags_and_remove.rb	diff1 \|	\|	blob \| history
db/migrate/020_populate_node_tags_and_remove_helper.c	diff1 \|	\|	blob \| history
db/migrate/021_move_to_innodb.rb	diff1 \|	\|	blob \| history
db/migrate/022_key_constraints.rb	diff1 \|	\|	blob \| history
db/migrate/023_add_changesets.rb	diff1 \|	\|	blob \| history
db/migrate/024_order_relation_members.rb	diff1 \|	\|	blob \| history
db/migrate/025_add_end_time_to_changesets.rb	diff1 \|	\|	blob \| history
lib/diff_reader.rb	diff1 \|	\|	blob \| history
lib/osm.rb	diff1 \|	diff2 \|	blob \| history
public/stylesheets/site.css	diff1 \|	diff2 \|	blob \| history
test/functional/node_controller_test.rb	diff1 \|	diff2 \|	blob \| history
test/functional/relation_controller_test.rb	diff1 \|	diff2 \|	blob \| history