From: Tom Hughes Date: Wed, 28 Mar 2018 16:38:34 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/1799' X-Git-Tag: live~4001 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/357de642b32520cc6a899384b1f8ad078dc479b1?hp=3b75e9241507c0672dabaec44ecb83148df979b6 Merge remote-tracking branch 'upstream/pull/1799' --- diff --git a/app/views/trace/edit.html.erb b/app/views/trace/edit.html.erb index 07e9820e6..b2254afdd 100644 --- a/app/views/trace/edit.html.erb +++ b/app/views/trace/edit.html.erb @@ -10,7 +10,7 @@
-

<%= @trace.name %> (<%= link_to t('trace.edit.download'), :controller => 'trace', :action => 'data', :id => @trace.id %>)

+

<%= @trace.name %> (<%= link_to t('trace.edit.download'), trace_data_path(@trace) %>)

diff --git a/app/views/trace/view.html.erb b/app/views/trace/view.html.erb index ef951372f..df45f2f2d 100644 --- a/app/views/trace/view.html.erb +++ b/app/views/trace/view.html.erb @@ -13,7 +13,7 @@ - + @@ -57,7 +57,7 @@ <% if current_user && (current_user==@trace.user || current_user.administrator? || current_user.moderator?)%>
<%= if_user(@trace.user) do %> - <%= button_to t('trace.view.edit_track'), :controller => 'trace', :action => 'edit', :id => @trace.id %> + <%= button_to t('trace.view.edit_track'), trace_edit_path(@trace) %> <% end %> <%= button_to t('trace.view.delete_track'), :controller => 'trace', :action => 'delete', :id => @trace.id %>
diff --git a/config/application.rb b/config/application.rb index 9ba122daf..b6e2ba467 100644 --- a/config/application.rb +++ b/config/application.rb @@ -43,8 +43,5 @@ module OpenStreetMap config.logstasher.logger_path = LOGSTASH_PATH config.logstasher.log_controller_parameters = true end - - # Configure image optimisation - config.assets.image_optim = YAML.load_file(Rails.root.join("config", "image_optim.yml")) end end diff --git a/config/image_optim/test.yml b/config/image_optim/test.yml new file mode 100644 index 000000000..00584e523 --- /dev/null +++ b/config/image_optim/test.yml @@ -0,0 +1,11 @@ +skip_missing_workers: true +advpng: false +gifsicle: false +jhead: false +jpegoptim: false +jpegtran: false +optipng: false +pngquant: false +pngout: false +pngcrush: false +svgo: false diff --git a/config/locales/en.yml b/config/locales/en.yml index 1a146701a..2aca45255 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1169,8 +1169,8 @@ en: paragraph_1_html: | OpenStreetMap has few formal rules but we expect all participants to collaborate with, and communicate with, the community. If you are considering - any activities other than editing by hand, please read and follow the guidelines on - Imports and + any activities other than editing by hand, please read and follow the guidelines on + Imports and Automated Edits. questions: title: Any questions? @@ -1196,7 +1196,7 @@ en: title: Join the community explanation_html: | If you have noticed a problem with our map data, for example a road is missing or your address, the best way to - proceed is to join the OpenStreetMap community and add or repair the data yourself. + proceed is to join the OpenStreetMap community and add or repair the data yourself. add_a_note: instructions_html: | Just click or the same icon on the map display. @@ -1206,8 +1206,8 @@ en: title: Other concerns explanation_html: | If you have concerns about how our data is being used or about the contents please consult our - copyright page for more legal information, or contact the appropriate - OSMF working group. + copyright page for more legal information, or contact the appropriate + OSMF working group. help_page: title: Getting Help introduction: | @@ -1277,13 +1277,13 @@ en: License page for details. legal_title: Legal legal_html: | - This site and many other related services are formally operated by the - OpenStreetMap Foundation (OSMF) - on behalf of the community. Use of all OSMF operated services is subject + This site and many other related services are formally operated by the + OpenStreetMap Foundation (OSMF) + on behalf of the community. Use of all OSMF operated services is subject to our Acceptable Use Policies and our Privacy Policy -
- Please contact the OSMF +
+ Please contact the OSMF if you have licensing, copyright or other legal questions.
OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OSMF. diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb index 18d5ec2f7..9abc7aa70 100644 --- a/test/application_system_test_case.rb +++ b/test/application_system_test_case.rb @@ -4,6 +4,8 @@ require "capybara/poltergeist" WebMock.disable_net_connect!(:allow_localhost => true) class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + ActionDispatch::SystemTesting::Server.silence_puma = true + driven_by :poltergeist, :screen_size => [1400, 1400] def initialize(*args)
<%= t'trace.view.filename' %><%= @trace.name %> (<%= link_to t('trace.view.download'), :controller => 'trace', :action => 'data', :id => @trace.id %>)<%= @trace.name %> (<%= link_to t('trace.view.download'), trace_data_path(@trace) %>)
<%= t'trace.view.uploaded' %>