diff --git a/Vagrantfile b/Vagrantfile
index 0cd5ac72a..7b033146c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,6 +1,13 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
+
+Vagrant.configure("2") do |config|
+ config.vm.provider "virtualbox" do |vb|
+ vb.customize ["modifyvm", :id, "--memory", "8192"]
+ end
+end
+
Vagrant.configure("2") do |config|
# use official ubuntu image for virtualbox
config.vm.provider "virtualbox" do |vb, override|
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index a2f43e955..010394c29 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -4,10 +4,10 @@
- <%= t('issues.new.disclaimer.placeholder') %>:
- - --> <%= t('issues.new.disclaimer.placeholder1') %>
- - --> <%= t('issues.new.disclaimer.placeholder2') %>
- - --> <%= t('issues.new.disclaimer.placeholder3') %>
+ <%= t('issues.new.disclaimer.intro') %>:
+ - <%= t('issues.new.disclaimer.not_just_mistake') %>
+ - <%= t('issues.new.disclaimer.unable_to_fix') %>
+ - <%= t('issues.new.disclaimer.resolve_with_user') %>
@@ -41,4 +41,4 @@
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a273903eb..5e7f25277 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -929,10 +929,10 @@ en:
details: Please provide some more details into the problem. (This field cannot be left blank!)
select: Select a reason for your report
disclaimer:
- placeholder: Before sending in a report for official action, be sure that
- placeholder1: You are sure that the problem is not just a mistake
- placeholder2: You are unable to fix the problem yourself
- placeholder3: You have tried to resolve the problem with the user
+ intro: Before sending in a report for official action, be sure that
+ not_just_mistake: You are sure that the problem is not just a mistake
+ unable_to_fix: You are unable to fix the problem yourself
+ resolve_with_user: You have tried to resolve the problem with the user
show:
comments:
reassign: The Issue was reassigned
diff --git a/db/migrate/028_add_more_changeset_indexes.rb b/db/migrate/028_add_more_changeset_indexes.rb
index b64c9caf0..976aeb19e 100644
--- a/db/migrate/028_add_more_changeset_indexes.rb
+++ b/db/migrate/028_add_more_changeset_indexes.rb
@@ -4,7 +4,7 @@ class AddMoreChangesetIndexes < ActiveRecord::Migration
def self.up
add_index "changesets", ["created_at"], :name => "changesets_created_at_idx"
add_index "changesets", ["closed_at"], :name => "changesets_closed_at_idx"
- add_index "changesets", %w(min_lat max_lat min_lon max_lon), :name => "changesets_bbox_idx", :using => "GIST"
+ add_index "changesets", %w(min_lat max_lat min_lon max_lon), :name => "changesets_bbox_idx"
end
def self.down