Merge remote-tracking branch 'upstream/pull/5346'

[rails.git] / app / views / traces / new.html.erb

diff --git a/app/views/traces/new.html.erb b/app/views/traces/new.html.erb
index bff8cd3bc0af22acd12731ebf364c4087b8fcbd2..ae5ffe5657ffbbfaddc7e2a0cd519aae89ddba26 100644 (file)
--- a/app/views/traces/new.html.erb
+++ b/app/views/traces/new.html.erb
@@ -3,7 +3,8 @@
 <% end %>
 
 <%= bootstrap_form_for @trace, :url => { :action => "create" }, :html => { :multipart => true } do |f| %>
-  <%= f.file_field :gpx_file, :placeholder => t("helpers.file.prompt") %>
+  <%= f.file_field :gpx_file, :placeholder => t("helpers.file.prompt"),
+                              :help => ".gpx, .tar.gz, .tar.bz2, .tar, .zip, .gpx.gz, .gpx.bz2" %>
   <%= f.text_field :description, :maxlength => 255 %>
   <%= f.text_field :tagstring %>
   <%= f.select :visibility,