Skip to content

Commit 69bc63d

Browse files
committedMar 15, 2019
Bundles with rails 5 locally, docker builds, not ran rails app:update yet
1 parent b244dcf commit 69bc63d

File tree

4 files changed

+18
-4
lines changed

4 files changed

+18
-4
lines changed
 

‎Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
22

33
gem 'rails', '5.0.0'
44

5-
gem 'pg', '~> 0.20'
5+
gem 'pg', '~> 0.21'
66
gem 'activerecord-postgis-adapter', '~> 4.0.0'
77
# # gem 'gdal', '~> 1.0.0'
88
gem 'dbf', '~> 2.0.7'

‎Gemfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -1139,7 +1139,7 @@ DEPENDENCIES
11391139
levenshtein (~> 0.2.2)
11401140
mocha (~> 1.0.0)
11411141
nokogiri (~> 1.10.1)
1142-
pg (~> 0.20)
1142+
pg (~> 0.21)
11431143
phantompdf (~> 1.2.2)
11441144
premailer-rails
11451145
rack-cache (~> 1.2)

‎Rakefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
# Add your own tasks in files placed in lib/tasks ending in .rake,
22
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
3+
require 'rake/testtask'
34

45
require File.expand_path('../config/application', __FILE__)
56

67
Rails.application.load_tasks
78

8-
Rails::TestTask.new("test:acceptance" => "test:prepare") do |t|
9+
Rake::TestTask.new("test:acceptance" => "test:prepare") do |t|
910
t.pattern = "test/acceptance/**/*_test.rb"
1011
end
1112

1213
Rake::Task["test:run"].enhance ["test:acceptance"]
14+

‎config/initializers/assets.rb

+13-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,13 @@
1-
Rails.application.config.assets.precompile += %w( pdf.css )
1+
# Be sure to restart your server when you modify this file.
2+
3+
# Version of your assets, change this if you want to expire all your assets.
4+
Rails.application.config.assets.version = '1.0'
5+
6+
# Add additional assets to the asset load path
7+
# Rails.application.config.assets.paths << Emoji.images_path
8+
9+
# Precompile additional assets.
10+
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
11+
# Rails.application.config.assets.precompile += %w( search.js )
12+
#
13+
Rails.application.config.assets.precompile += %w( pdf.css )

0 commit comments

Comments
 (0)
Please sign in to comment.