]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a7f689 9bdade3)
Merged 17256:18123 from trunk.
authorTom Hughes <tom@compton.nu>
Tue, 13 Oct 2009 20:06:24 +0000 (20:06 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 13 Oct 2009 20:06:24 +0000 (20:06 +0000)
1  2 
app/controllers/application_controller.rb patch | diff1 | diff2 | blob | history
app/controllers/trace_controller.rb patch | diff1 | diff2 | blob | history
app/views/layouts/site.html.erb patch | diff1 | diff2 | blob | history
app/views/site/edit.html.erb patch | diff1 | diff2 | blob | history
test/functional/changeset_controller_test.rb patch | diff1 | diff2 | blob | history

diff --cc app/controllers/trace_controller.rb
Simple merge
diff --cc app/views/layouts/site.html.erb
index f072544aa21367fdbbbb0d55c41dc5998baadd4c,1e4e56e6acf9e14de9807ed526bdcd1987fda2c4..d1983a9f0ba2e4cb72c62517bfe7406fd5b9b9a1
--- 1/app/views/layouts/site.html.erb
--- 2/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@@ -1,7 -1,7 +1,8 @@@
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<%= t'html.dir' %>">
    <head>
 +    <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"/>
+     <%= javascript_strings %>
      <%= javascript_include_tag 'prototype' %>
      <%= javascript_include_tag 'site' %>
      <!--[if lt IE 7]><%= javascript_include_tag 'pngfix' %><![endif]--> <!-- thanks, microsoft! -->
diff --cc app/views/site/edit.html.erb
Simple merge
The OpenStreetMap web site