Update to rails 5.0.4
This commit is contained in:
Tom Hughes
parent
895b4e72ab
commit
81deb35331
15 changed files with 280 additions and 325 deletions
11
Gemfile
11
Gemfile
|
|
@ -1,7 +1,7 @@
|
|||
source "https://rubygems.org"
|
||||
|
||||
# Require rails
|
||||
gem "rails", "4.2.9"
|
||||
gem "rails", "5.0.4"
|
||||
|
||||
# Require things which have moved to gems in ruby 1.9
|
||||
gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19
|
||||
|
|
@ -22,7 +22,7 @@ gem "sass-rails", "~> 5.0"
|
|||
gem "uglifier", ">= 1.3.0"
|
||||
|
||||
# Use CoffeeScript for .js.coffee assets and views
|
||||
gem "coffee-rails", "~> 4.1.0"
|
||||
gem "coffee-rails", "~> 4.2"
|
||||
|
||||
# Use jquery as the JavaScript library
|
||||
gem "jquery-rails"
|
||||
|
|
@ -42,7 +42,7 @@ gem "image_optim_rails"
|
|||
|
||||
# Load rails plugins
|
||||
gem "actionpack-page_caching"
|
||||
gem "composite_primary_keys", "~> 8.1.0"
|
||||
gem "composite_primary_keys", "~> 9.0.7"
|
||||
gem "deadlock_retry", ">= 1.2.0"
|
||||
gem "dynamic_form"
|
||||
gem "http_accept_language", "~> 2.0.0"
|
||||
|
|
@ -51,6 +51,7 @@ gem "oauth-plugin", ">= 0.5.1"
|
|||
gem "paperclip", "~> 4.0"
|
||||
gem "rack-cors"
|
||||
gem "rails-i18n", "~> 4.0.0"
|
||||
gem "record_tag_helper"
|
||||
gem "rinku", ">= 1.2.2", :require => "rails_rinku"
|
||||
gem "validates_email_format_of", ">= 1.5.1"
|
||||
|
||||
|
|
@ -103,12 +104,14 @@ gem "logstasher"
|
|||
|
||||
# Gems useful for development
|
||||
group :development do
|
||||
gem "listen"
|
||||
gem "vendorer"
|
||||
end
|
||||
|
||||
# Gems needed for running tests
|
||||
group :test do
|
||||
gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]
|
||||
gem "rails-controller-testing"
|
||||
gem "rubocop"
|
||||
gem "timecop"
|
||||
gem "webmock"
|
||||
|
|
@ -119,6 +122,6 @@ group :development, :test do
|
|||
gem "coveralls", :require => false
|
||||
gem "factory_girl_rails"
|
||||
gem "jshint"
|
||||
gem "konacha"
|
||||
# gem "konacha"
|
||||
gem "poltergeist"
|
||||
end
|
||||
|
|
|
|||
146
Gemfile.lock
146
Gemfile.lock
|
|
@ -2,45 +2,48 @@ GEM
|
|||
remote: https://rubygems.org/
|
||||
specs:
|
||||
SystemTimer (1.2.3)
|
||||
actionmailer (4.2.9)
|
||||
actionpack (= 4.2.9)
|
||||
actionview (= 4.2.9)
|
||||
activejob (= 4.2.9)
|
||||
actioncable (5.0.4)
|
||||
actionpack (= 5.0.4)
|
||||
nio4r (>= 1.2, < 3.0)
|
||||
websocket-driver (~> 0.6.1)
|
||||
actionmailer (5.0.4)
|
||||
actionpack (= 5.0.4)
|
||||
actionview (= 5.0.4)
|
||||
activejob (= 5.0.4)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
actionpack (4.2.9)
|
||||
actionview (= 4.2.9)
|
||||
activesupport (= 4.2.9)
|
||||
rack (~> 1.6)
|
||||
rack-test (~> 0.6.2)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-dom-testing (~> 2.0)
|
||||
actionpack (5.0.4)
|
||||
actionview (= 5.0.4)
|
||||
activesupport (= 5.0.4)
|
||||
rack (~> 2.0)
|
||||
rack-test (~> 0.6.3)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||
actionpack-page_caching (1.1.0)
|
||||
actionpack (>= 4.0.0, < 6)
|
||||
actionview (4.2.9)
|
||||
activesupport (= 4.2.9)
|
||||
actionview (5.0.4)
|
||||
activesupport (= 5.0.4)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
||||
activejob (4.2.9)
|
||||
activesupport (= 4.2.9)
|
||||
globalid (>= 0.3.0)
|
||||
activemodel (4.2.9)
|
||||
activesupport (= 4.2.9)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.2.9)
|
||||
activemodel (= 4.2.9)
|
||||
activesupport (= 4.2.9)
|
||||
arel (~> 6.0)
|
||||
activesupport (4.2.9)
|
||||
activejob (5.0.4)
|
||||
activesupport (= 5.0.4)
|
||||
globalid (>= 0.3.6)
|
||||
activemodel (5.0.4)
|
||||
activesupport (= 5.0.4)
|
||||
activerecord (5.0.4)
|
||||
activemodel (= 5.0.4)
|
||||
activesupport (= 5.0.4)
|
||||
arel (~> 7.0)
|
||||
activesupport (5.0.4)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (~> 0.7)
|
||||
minitest (~> 5.1)
|
||||
thread_safe (~> 0.3, >= 0.3.4)
|
||||
tzinfo (~> 1.1)
|
||||
addressable (2.5.1)
|
||||
public_suffix (~> 2.0, >= 2.0.2)
|
||||
arel (6.0.4)
|
||||
arel (7.1.4)
|
||||
ast (2.3.0)
|
||||
autoprefixer-rails (7.1.1.2)
|
||||
execjs
|
||||
|
|
@ -59,16 +62,15 @@ GEM
|
|||
cliver (0.3.2)
|
||||
cocaine (0.5.8)
|
||||
climate_control (>= 0.0.3, < 1.0)
|
||||
coffee-rails (4.1.1)
|
||||
coffee-rails (4.2.2)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (>= 4.0.0, < 5.1.x)
|
||||
railties (>= 4.0.0)
|
||||
coffee-script (2.4.1)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.12.2)
|
||||
colorize (0.8.1)
|
||||
composite_primary_keys (8.1.6)
|
||||
activerecord (~> 4.2.0)
|
||||
composite_primary_keys (9.0.7)
|
||||
activerecord (~> 5.0.0)
|
||||
concurrent-ruby (1.0.5)
|
||||
coveralls (0.8.21)
|
||||
json (>= 1.8, < 3)
|
||||
|
|
@ -93,6 +95,7 @@ GEM
|
|||
railties (>= 3.0.0)
|
||||
faraday (0.12.1)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
ffi (1.9.18)
|
||||
fspath (3.1.0)
|
||||
geoip (1.6.3)
|
||||
globalid (0.4.0)
|
||||
|
|
@ -132,16 +135,12 @@ GEM
|
|||
jsonify (< 0.4.0)
|
||||
jwt (1.5.6)
|
||||
kgio (2.11.0)
|
||||
konacha (4.0.0)
|
||||
actionpack (>= 4.1, < 5)
|
||||
capybara
|
||||
colorize
|
||||
railties (>= 4.1, < 5)
|
||||
sprockets (>= 2, < 4)
|
||||
sprockets-rails (>= 2, < 4)
|
||||
tilt
|
||||
libv8 (3.16.14.19)
|
||||
libxml-ruby (3.0.0)
|
||||
listen (3.1.5)
|
||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||
rb-inotify (~> 0.9, >= 0.9.7)
|
||||
ruby_dep (~> 1.2)
|
||||
logstash-event (1.2.02)
|
||||
logstasher (1.2.1)
|
||||
activesupport (>= 4.0)
|
||||
|
|
@ -151,6 +150,7 @@ GEM
|
|||
nokogiri (>= 1.5.9)
|
||||
mail (2.6.6)
|
||||
mime-types (>= 1.16, < 4)
|
||||
method_source (0.8.2)
|
||||
mime-types (3.1)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2016.0521)
|
||||
|
|
@ -160,6 +160,7 @@ GEM
|
|||
multi_json (1.12.1)
|
||||
multi_xml (0.6.0)
|
||||
multipart-post (2.0.0)
|
||||
nio4r (2.1.0)
|
||||
nokogiri (1.8.0)
|
||||
mini_portile2 (~> 2.2.0)
|
||||
nokogumbo (1.4.13)
|
||||
|
|
@ -223,7 +224,7 @@ GEM
|
|||
psych (2.2.4)
|
||||
public_suffix (2.0.5)
|
||||
r2 (0.2.6)
|
||||
rack (1.6.8)
|
||||
rack (2.0.3)
|
||||
rack-cors (0.4.1)
|
||||
rack-openid (1.3.1)
|
||||
rack (>= 1.1.0)
|
||||
|
|
@ -231,36 +232,44 @@ GEM
|
|||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rack-uri_sanitizer (0.0.2)
|
||||
rails (4.2.9)
|
||||
actionmailer (= 4.2.9)
|
||||
actionpack (= 4.2.9)
|
||||
actionview (= 4.2.9)
|
||||
activejob (= 4.2.9)
|
||||
activemodel (= 4.2.9)
|
||||
activerecord (= 4.2.9)
|
||||
activesupport (= 4.2.9)
|
||||
rails (5.0.4)
|
||||
actioncable (= 5.0.4)
|
||||
actionmailer (= 5.0.4)
|
||||
actionpack (= 5.0.4)
|
||||
actionview (= 5.0.4)
|
||||
activejob (= 5.0.4)
|
||||
activemodel (= 5.0.4)
|
||||
activerecord (= 5.0.4)
|
||||
activesupport (= 5.0.4)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.2.9)
|
||||
sprockets-rails
|
||||
rails-deprecated_sanitizer (1.0.3)
|
||||
activesupport (>= 4.2.0.alpha)
|
||||
rails-dom-testing (1.0.8)
|
||||
activesupport (>= 4.2.0.beta, < 5.0)
|
||||
nokogiri (~> 1.6)
|
||||
rails-deprecated_sanitizer (>= 1.0.1)
|
||||
railties (= 5.0.4)
|
||||
sprockets-rails (>= 2.0.0)
|
||||
rails-controller-testing (1.0.2)
|
||||
actionpack (~> 5.x, >= 5.0.1)
|
||||
actionview (~> 5.x, >= 5.0.1)
|
||||
activesupport (~> 5.x)
|
||||
rails-dom-testing (2.0.3)
|
||||
activesupport (>= 4.2.0)
|
||||
nokogiri (>= 1.6)
|
||||
rails-html-sanitizer (1.0.3)
|
||||
loofah (~> 2.0)
|
||||
rails-i18n (4.0.9)
|
||||
i18n (~> 0.7)
|
||||
railties (~> 4.0)
|
||||
railties (4.2.9)
|
||||
actionpack (= 4.2.9)
|
||||
activesupport (= 4.2.9)
|
||||
rails-i18n (4.0.2)
|
||||
i18n (~> 0.6)
|
||||
rails (>= 4.0)
|
||||
railties (5.0.4)
|
||||
actionpack (= 5.0.4)
|
||||
activesupport (= 5.0.4)
|
||||
method_source
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rainbow (2.2.2)
|
||||
rake
|
||||
rake (12.0.0)
|
||||
rb-fsevent (0.9.8)
|
||||
rb-inotify (0.9.10)
|
||||
ffi (>= 0.5.0, < 2)
|
||||
record_tag_helper (1.0.0)
|
||||
actionview (~> 5.x)
|
||||
redcarpet (3.4.0)
|
||||
ref (2.0.0)
|
||||
request_store (1.3.2)
|
||||
|
|
@ -275,6 +284,7 @@ GEM
|
|||
unicode-display_width (~> 1.0, >= 1.0.1)
|
||||
ruby-openid (2.7.0)
|
||||
ruby-progressbar (1.8.1)
|
||||
ruby_dep (1.5.0)
|
||||
safe_yaml (1.0.4)
|
||||
sanitize (4.5.0)
|
||||
crass (~> 1.0.2)
|
||||
|
|
@ -339,8 +349,8 @@ DEPENDENCIES
|
|||
autoprefixer-rails
|
||||
bigdecimal (~> 1.1.0)
|
||||
canonical-rails
|
||||
coffee-rails (~> 4.1.0)
|
||||
composite_primary_keys (~> 8.1.0)
|
||||
coffee-rails (~> 4.2)
|
||||
composite_primary_keys (~> 9.0.7)
|
||||
coveralls
|
||||
dalli
|
||||
deadlock_retry (>= 1.2.0)
|
||||
|
|
@ -357,8 +367,8 @@ DEPENDENCIES
|
|||
json
|
||||
jsonify-rails
|
||||
kgio
|
||||
konacha
|
||||
libxml-ruby (>= 2.0.5)
|
||||
listen
|
||||
logstasher
|
||||
minitest (~> 5.1)
|
||||
oauth-plugin (>= 0.5.1)
|
||||
|
|
@ -376,8 +386,10 @@ DEPENDENCIES
|
|||
r2
|
||||
rack-cors
|
||||
rack-uri_sanitizer
|
||||
rails (= 4.2.9)
|
||||
rails (= 5.0.4)
|
||||
rails-controller-testing
|
||||
rails-i18n (~> 4.0.0)
|
||||
record_tag_helper
|
||||
redcarpet
|
||||
rinku (>= 1.2.2)
|
||||
rotp
|
||||
|
|
|
|||
4
Rakefile
4
Rakefile
|
|
@ -1,6 +1,6 @@
|
|||
# Add your own tasks in files placed in lib/tasks ending in .rake,
|
||||
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
|
||||
|
||||
require File.expand_path("../config/application", __FILE__)
|
||||
require_relative "config/application"
|
||||
|
||||
OpenStreetMap::Application.load_tasks
|
||||
Rails.application.load_tasks
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
class ApplicationController < ActionController::Base
|
||||
include SessionPersistence
|
||||
|
||||
protect_from_forgery
|
||||
protect_from_forgery :with => :exception
|
||||
|
||||
before_action :fetch_body
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
# This file is used by Rack-based servers to start the application.
|
||||
|
||||
require ::File.expand_path("../config/environment", __FILE__)
|
||||
require_relative "config/environment"
|
||||
|
||||
run Rails.application
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
require File.expand_path("../boot", __FILE__)
|
||||
require_relative "boot"
|
||||
|
||||
require File.expand_path("../preinitializer", __FILE__)
|
||||
require_relative "preinitializer"
|
||||
|
||||
if STATUS == :database_offline
|
||||
require "action_controller/railtie"
|
||||
|
|
@ -22,17 +22,6 @@ module OpenStreetMap
|
|||
# Application configuration should go into files in config/initializers
|
||||
# -- all .rb files in that directory are automatically loaded.
|
||||
|
||||
# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
|
||||
# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
|
||||
# config.time_zone = 'Central Time (US & Canada)'
|
||||
|
||||
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
|
||||
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
|
||||
# config.i18n.default_locale = :de
|
||||
|
||||
# Do not swallow errors in after_commit/after_rollback callbacks.
|
||||
config.active_record.raise_in_transactional_callbacks = true unless STATUS == :database_offline
|
||||
|
||||
# Custom directories with classes and modules you want to be autoloadable.
|
||||
config.autoload_paths += %W[#{config.root}/lib]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
|
||||
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
|
||||
|
||||
require "bundler/setup" # Set up gems listed in the Gemfile.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
OpenStreetMap::Application.configure do
|
||||
Rails.application.configure do
|
||||
# Settings specified here will take precedence over those in config/application.rb.
|
||||
|
||||
# In the development environment your application's code is reloaded on
|
||||
|
|
@ -9,13 +9,14 @@ OpenStreetMap::Application.configure do
|
|||
# Do not eager load code on boot.
|
||||
config.eager_load = false
|
||||
|
||||
# Show full error reports and disable caching.
|
||||
config.consider_all_requests_local = true
|
||||
config.action_controller.perform_caching = false
|
||||
# Show full error reports.
|
||||
config.consider_all_requests_local = true
|
||||
|
||||
# Don't care if the mailer can't send.
|
||||
config.action_mailer.raise_delivery_errors = false
|
||||
|
||||
config.action_mailer.perform_caching = false
|
||||
|
||||
# Print deprecation notices to the Rails logger.
|
||||
config.active_support.deprecation = :log
|
||||
|
||||
|
|
@ -29,15 +30,13 @@ OpenStreetMap::Application.configure do
|
|||
# number of complex assets.
|
||||
config.assets.debug = true
|
||||
|
||||
# Asset digests allow you to set far-future HTTP expiration dates on all assets,
|
||||
# yet still be able to expire them through the digest params.
|
||||
config.assets.digest = true
|
||||
|
||||
# Adds additional error checking when serving assets at runtime.
|
||||
# Checks for improperly declared sprockets dependencies.
|
||||
# Raises helpful error messages.
|
||||
config.assets.raise_runtime_errors = true
|
||||
# Suppress logger output for asset requests.
|
||||
config.assets.quiet = true
|
||||
|
||||
# Raises error for missing translations
|
||||
# config.action_view.raise_on_missing_translations = true
|
||||
|
||||
# Use an evented file watcher to asynchronously detect changes in source code,
|
||||
# routes, locales, etc. This feature depends on the listen gem.
|
||||
config.file_watcher = ActiveSupport::EventedFileUpdateChecker
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
OpenStreetMap::Application.configure do
|
||||
Rails.application.configure do
|
||||
# Settings specified here will take precedence over those in config/application.rb.
|
||||
|
||||
# Code is not reloaded between requests.
|
||||
|
|
@ -14,15 +14,9 @@ OpenStreetMap::Application.configure do
|
|||
config.consider_all_requests_local = false
|
||||
config.action_controller.perform_caching = true
|
||||
|
||||
# Enable Rack::Cache to put a simple HTTP cache in front of your application
|
||||
# Add `rack-cache` to your Gemfile before enabling this.
|
||||
# For large-scale production use, consider using a caching reverse proxy like
|
||||
# NGINX, varnish or squid.
|
||||
# config.action_dispatch.rack_cache = true
|
||||
|
||||
# Disable serving static files from the `/public` folder by default since
|
||||
# Apache or NGINX already handles this.
|
||||
config.serve_static_files = ENV["RAILS_SERVE_STATIC_FILES"].present?
|
||||
config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
|
||||
|
||||
# Compress JavaScripts and CSS.
|
||||
config.assets.js_compressor = :uglifier
|
||||
|
|
@ -31,16 +25,20 @@ OpenStreetMap::Application.configure do
|
|||
# Do not fallback to assets pipeline if a precompiled asset is missed.
|
||||
config.assets.compile = false
|
||||
|
||||
# Asset digests allow you to set far-future HTTP expiration dates on all assets,
|
||||
# yet still be able to expire them through the digest params.
|
||||
config.assets.digest = true
|
||||
|
||||
# `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
|
||||
|
||||
# Enable serving of images, stylesheets, and JavaScripts from an asset server.
|
||||
# config.action_controller.asset_host = 'http://assets.example.com'
|
||||
|
||||
# Specifies the header that your server uses for sending files.
|
||||
# config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
|
||||
# config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
|
||||
|
||||
# Mount Action Cable outside main process or domain
|
||||
# config.action_cable.mount_path = nil
|
||||
# config.action_cable.url = 'wss://example.com/cable'
|
||||
# config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
|
||||
|
||||
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
|
||||
# config.force_ssl = true
|
||||
|
||||
|
|
@ -49,23 +47,22 @@ OpenStreetMap::Application.configure do
|
|||
config.log_level = :info
|
||||
|
||||
# Prepend all log lines with the following tags.
|
||||
# config.log_tags = [ :subdomain, :uuid ]
|
||||
config.log_tags = [:request_id]
|
||||
|
||||
# Use a different log path in production.
|
||||
config.paths["log"] = LOG_PATH if defined?(LOG_PATH)
|
||||
|
||||
# Use a different logger for distributed setups.
|
||||
# config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
|
||||
|
||||
# Use a different cache store in production.
|
||||
# config.cache_store = :mem_cache_store
|
||||
|
||||
# Use a real queuing backend for Active Job (and separate queues per environment)
|
||||
# config.active_job.queue_adapter = :resque
|
||||
# config.active_job.queue_name_prefix = "rails50_#{Rails.env}"
|
||||
config.action_mailer.perform_caching = false
|
||||
|
||||
# Configure caching of static assets
|
||||
config.action_controller.page_cache_directory = Rails.public_path
|
||||
|
||||
# Enable serving of images, stylesheets, and JavaScripts from an asset server.
|
||||
# config.action_controller.asset_host = 'http://assets.example.com'
|
||||
|
||||
# Ignore bad email addresses and do not raise email delivery errors.
|
||||
# Set this to true and configure the email server for immediate delivery to raise delivery errors.
|
||||
# config.action_mailer.raise_delivery_errors = false
|
||||
|
|
@ -80,8 +77,21 @@ OpenStreetMap::Application.configure do
|
|||
# Use default logging formatter so that PID and timestamp are not suppressed.
|
||||
config.log_formatter = ::Logger::Formatter.new
|
||||
|
||||
# Use a different logger for distributed setups.
|
||||
# require 'syslog/logger'
|
||||
# config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
|
||||
|
||||
if ENV["RAILS_LOG_TO_STDOUT"].present?
|
||||
logger = ActiveSupport::Logger.new(STDOUT)
|
||||
logger.formatter = config.log_formatter
|
||||
config.logger = ActiveSupport::TaggedLogging.new(logger)
|
||||
end
|
||||
|
||||
# Do not dump schema after migrations.
|
||||
unless STATUS == :database_offline
|
||||
config.active_record.dump_schema_after_migration = false
|
||||
end
|
||||
|
||||
# Enable autoloading of dependencies.
|
||||
config.enable_dependency_loading = true
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
OpenStreetMap::Application.configure do
|
||||
Rails.application.configure do
|
||||
# Settings specified here will take precedence over those in config/application.rb.
|
||||
|
||||
# The test environment is used exclusively to run your application's
|
||||
|
|
@ -12,9 +12,11 @@ OpenStreetMap::Application.configure do
|
|||
# preloads Rails for running tests, you may have to set it to true.
|
||||
config.eager_load = false
|
||||
|
||||
# Configure static file server for tests with Cache-Control for performance.
|
||||
config.serve_static_files = true
|
||||
config.static_cache_control = "public, max-age=3600"
|
||||
# Configure public file server for tests with Cache-Control for performance.
|
||||
config.public_file_server.enabled = true
|
||||
config.public_file_server.headers = {
|
||||
"Cache-Control" => "public, max-age=#{1.hour.seconds.to_i}"
|
||||
}
|
||||
|
||||
# Show full error reports and disable caching.
|
||||
config.consider_all_requests_local = true
|
||||
|
|
@ -25,15 +27,13 @@ OpenStreetMap::Application.configure do
|
|||
|
||||
# Disable request forgery protection in test environment.
|
||||
config.action_controller.allow_forgery_protection = false
|
||||
config.action_mailer.perform_caching = false
|
||||
|
||||
# Tell Action Mailer not to deliver emails to the real world.
|
||||
# The :test delivery method accumulates sent emails in the
|
||||
# ActionMailer::Base.deliveries array.
|
||||
config.action_mailer.delivery_method = :test
|
||||
|
||||
# Randomize the order test cases are executed.
|
||||
config.active_support.test_order = :random
|
||||
|
||||
# Print deprecation notices to the stderr.
|
||||
config.active_support.deprecation = :stderr
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
# Be sure to restart your server when you modify this file.
|
||||
|
||||
# Specify a serializer for the signed and encrypted cookie jars.
|
||||
# Valid options are :json, :marshal, and :hybrid.
|
||||
Rails.application.config.action_dispatch.cookies_serializer = :json
|
||||
|
|
|
|||
|
|
@ -5,18 +5,28 @@
|
|||
|
||||
# Make sure the secret is at least 30 characters and all random,
|
||||
# no regular words or you'll be exposed to dictionary attacks.
|
||||
# You can use `rake secret` to generate a secure secret key.
|
||||
# You can use `rails secret` to generate a secure secret key.
|
||||
|
||||
# Make sure the secrets in this file are kept private
|
||||
# if you're sharing your code publicly.
|
||||
|
||||
# Shared secrets are available across all environments.
|
||||
|
||||
# shared:
|
||||
# api_key: a1B2c3D4e5F6
|
||||
|
||||
# Environmental secrets are only available for that specific environment.
|
||||
|
||||
development:
|
||||
secret_key_base: 1ce5ed17771b4fdc3f755c5b98459d67816f99ec5889ec2fa7bf2bd3cba3ad5cc453693ce3c5d121669be478fb811136f4f483e6f39ac1f0e34ba66e8acab574
|
||||
|
||||
test:
|
||||
secret_key_base: 10d52b1bf88c429e73ffbc5e5f58b037db21f38ea88b8b454e55d52ed8bcc6e7fe3b48a79b2f36eb78a4685224d707767d083f79c51f7d81a9d4a06d1c1e2534
|
||||
|
||||
# Do not keep production secrets in the repository,
|
||||
# instead read values from the environment.
|
||||
# Do not keep production secrets in the unencrypted secrets file.
|
||||
# Instead, either read values from the environment.
|
||||
# Or, use `bin/rails secrets:setup` to configure encrypted secrets
|
||||
# and move the `production:` environment over there.
|
||||
|
||||
production:
|
||||
secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# This file should contain all the record creation needed to seed the database with its default values.
|
||||
# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
|
||||
# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup).
|
||||
#
|
||||
# Examples:
|
||||
#
|
||||
# cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
|
||||
# Mayor.create(:name => 'Daley', :city => cities.first)
|
||||
# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
|
||||
# Character.create(name: 'Luke', movie: movies.first)
|
||||
|
|
|
|||
308
db/structure.sql
308
db/structure.sql
|
|
@ -2,8 +2,8 @@
|
|||
-- PostgreSQL database dump
|
||||
--
|
||||
|
||||
-- Dumped from database version 9.5.6
|
||||
-- Dumped by pg_dump version 9.5.6
|
||||
-- Dumped from database version 9.5.7
|
||||
-- Dumped by pg_dump version 9.5.7
|
||||
|
||||
SET statement_timeout = 0;
|
||||
SET lock_timeout = 0;
|
||||
|
|
@ -187,6 +187,18 @@ CREATE SEQUENCE acls_id_seq
|
|||
ALTER SEQUENCE acls_id_seq OWNED BY acls.id;
|
||||
|
||||
|
||||
--
|
||||
-- Name: ar_internal_metadata; Type: TABLE; Schema: public; Owner: -
|
||||
--
|
||||
|
||||
CREATE TABLE ar_internal_metadata (
|
||||
key character varying NOT NULL,
|
||||
value character varying,
|
||||
created_at timestamp without time zone NOT NULL,
|
||||
updated_at timestamp without time zone NOT NULL
|
||||
);
|
||||
|
||||
|
||||
--
|
||||
-- Name: changeset_comments; Type: TABLE; Schema: public; Owner: -
|
||||
--
|
||||
|
|
@ -1354,6 +1366,14 @@ ALTER TABLE ONLY acls
|
|||
ADD CONSTRAINT acls_pkey PRIMARY KEY (id);
|
||||
|
||||
|
||||
--
|
||||
-- Name: ar_internal_metadata_pkey; Type: CONSTRAINT; Schema: public; Owner: -
|
||||
--
|
||||
|
||||
ALTER TABLE ONLY ar_internal_metadata
|
||||
ADD CONSTRAINT ar_internal_metadata_pkey PRIMARY KEY (key);
|
||||
|
||||
|
||||
--
|
||||
-- Name: changeset_comments_pkey; Type: CONSTRAINT; Schema: public; Owner: -
|
||||
--
|
||||
|
|
@ -2513,193 +2533,101 @@ ALTER TABLE ONLY ways
|
|||
|
||||
SET search_path TO "$user", public;
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('1');
|
||||
INSERT INTO "schema_migrations" (version) VALUES
|
||||
('1'),
|
||||
('10'),
|
||||
('11'),
|
||||
('12'),
|
||||
('13'),
|
||||
('14'),
|
||||
('15'),
|
||||
('16'),
|
||||
('17'),
|
||||
('18'),
|
||||
('19'),
|
||||
('2'),
|
||||
('20'),
|
||||
('20100513171259'),
|
||||
('20100516124737'),
|
||||
('20100910084426'),
|
||||
('20101114011429'),
|
||||
('20110322001319'),
|
||||
('20110508145337'),
|
||||
('20110521142405'),
|
||||
('20110925112722'),
|
||||
('20111116184519'),
|
||||
('20111212183945'),
|
||||
('20120123184321'),
|
||||
('20120208122334'),
|
||||
('20120208194454'),
|
||||
('20120214210114'),
|
||||
('20120219161649'),
|
||||
('20120318201948'),
|
||||
('20120328090602'),
|
||||
('20120404205604'),
|
||||
('20120808231205'),
|
||||
('20121005195010'),
|
||||
('20121012044047'),
|
||||
('20121119165817'),
|
||||
('20121202155309'),
|
||||
('20121203124841'),
|
||||
('20130328184137'),
|
||||
('20131212124700'),
|
||||
('20140115192822'),
|
||||
('20140117185510'),
|
||||
('20140210003018'),
|
||||
('20140507110937'),
|
||||
('20140519141742'),
|
||||
('20150110152606'),
|
||||
('20150111192335'),
|
||||
('20150222101847'),
|
||||
('20150818224516'),
|
||||
('20161002153425'),
|
||||
('20161011010929'),
|
||||
('20170222134109'),
|
||||
('21'),
|
||||
('22'),
|
||||
('23'),
|
||||
('24'),
|
||||
('25'),
|
||||
('26'),
|
||||
('27'),
|
||||
('28'),
|
||||
('29'),
|
||||
('3'),
|
||||
('30'),
|
||||
('31'),
|
||||
('32'),
|
||||
('33'),
|
||||
('34'),
|
||||
('35'),
|
||||
('36'),
|
||||
('37'),
|
||||
('38'),
|
||||
('39'),
|
||||
('4'),
|
||||
('40'),
|
||||
('41'),
|
||||
('42'),
|
||||
('43'),
|
||||
('44'),
|
||||
('45'),
|
||||
('46'),
|
||||
('47'),
|
||||
('48'),
|
||||
('49'),
|
||||
('5'),
|
||||
('50'),
|
||||
('51'),
|
||||
('52'),
|
||||
('53'),
|
||||
('54'),
|
||||
('55'),
|
||||
('56'),
|
||||
('57'),
|
||||
('6'),
|
||||
('7'),
|
||||
('8'),
|
||||
('9');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('10');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('11');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('12');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('13');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('14');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('15');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('16');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('17');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('18');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('19');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('2');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20100513171259');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20100516124737');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20100910084426');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20101114011429');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20110322001319');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20110508145337');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20110521142405');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20110925112722');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20111116184519');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20111212183945');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20120123184321');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20120208122334');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20120208194454');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20120214210114');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20120219161649');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20120318201948');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20120328090602');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20120404205604');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20120808231205');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20121005195010');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20121012044047');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20121119165817');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20121202155309');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20121203124841');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20130328184137');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20131212124700');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20140115192822');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20140117185510');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20140210003018');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20140507110937');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20140519141742');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20150110152606');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20150111192335');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20150222101847');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20150818224516');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20161002153425');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20161011010929');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('20170222134109');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('21');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('22');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('23');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('24');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('25');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('26');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('27');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('28');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('29');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('3');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('30');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('31');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('32');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('33');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('34');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('35');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('36');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('37');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('38');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('39');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('4');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('40');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('41');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('42');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('43');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('44');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('45');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('46');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('47');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('48');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('49');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('5');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('50');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('51');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('52');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('53');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('54');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('55');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('56');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('57');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('6');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('7');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('8');
|
||||
|
||||
INSERT INTO schema_migrations (version) VALUES ('9');
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
namespace :test do
|
||||
Rails::TestTask.new(lib: "test:prepare") do |t|
|
||||
t.pattern = "test/lib/**/*_test.rb"
|
||||
task "lib" => "test:prepare" do
|
||||
$LOAD_PATH << "test"
|
||||
Minitest.rake_run(["test/lib"])
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue