cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to tails 4.2.5.1

Browse source
This commit is contained in:
Tom Hughes 2016-01-25 21:26:54 +00:00
parent 77c25dca8c
commit e4acc41d28
3 changed files with 43 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Gemfile
View file

@ -1,7 +1,7 @@
source "https://rubygems.org"
# Require rails
gem "rails", "4.2.5"
gem "rails", "4.2.5.1"
# Require things which have moved to gems in ruby 1.9
gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19
@ -91,6 +91,9 @@ gem "kgio"
# Used to generate logstash friendly log files
gem "logstasher"
# Stay with sprockets-rails 2.x pending fix for konacha
gem "sprockets-rails", "< 3"
# Gems useful for development
group :development do
gem "vendorer"

71
Gemfile.lock
View file

@ -2,38 +2,38 @@ GEM
remote: https://rubygems.org/
specs:
SystemTimer (1.2.3)
actionmailer (4.2.5)
actionpack (= 4.2.5)
actionview (= 4.2.5)
activejob (= 4.2.5)
actionmailer (4.2.5.1)
actionpack (= 4.2.5.1)
actionview (= 4.2.5.1)
activejob (= 4.2.5.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.5)
actionview (= 4.2.5)
activesupport (= 4.2.5)
actionpack (4.2.5.1)
actionview (= 4.2.5.1)
activesupport (= 4.2.5.1)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionpack-page_caching (1.0.2)
actionpack (>= 4.0.0, < 5)
actionview (4.2.5)
activesupport (= 4.2.5)
actionview (4.2.5.1)
activesupport (= 4.2.5.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.5)
activesupport (= 4.2.5)
activejob (4.2.5.1)
activesupport (= 4.2.5.1)
globalid (>= 0.3.0)
activemodel (4.2.5)
activesupport (= 4.2.5)
activemodel (4.2.5.1)
activesupport (= 4.2.5.1)
builder (~> 3.1)
activerecord (4.2.5)
activemodel (= 4.2.5)
activesupport (= 4.2.5)
activerecord (4.2.5.1)
activemodel (= 4.2.5.1)
activesupport (= 4.2.5.1)
arel (~> 6.0)
activesupport (4.2.5)
activesupport (4.2.5.1)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@ -147,12 +147,12 @@ GEM
mime-types (2.99)
mimemagic (0.3.0)
mini_portile2 (2.0.0)
minitest (5.8.3)
minitest (5.8.4)
multi_json (1.11.2)
multi_xml (0.5.5)
multipart-post (2.0.0)
netrc (0.11.0)
nokogiri (1.6.7.1)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
nokogumbo (1.4.7)
nokogiri
@ -194,7 +194,7 @@ GEM
cocaine (~> 0.5.5)
mime-types
mimemagic (= 0.3.0)
parser (2.3.0.1)
parser (2.3.0.2)
ast (~> 2.2)
pg (0.18.4)
poltergeist (1.8.1)
@ -214,16 +214,16 @@ GEM
rack-test (0.6.3)
rack (>= 1.0)
rack-uri_sanitizer (0.0.2)
rails (4.2.5)
actionmailer (= 4.2.5)
actionpack (= 4.2.5)
actionview (= 4.2.5)
activejob (= 4.2.5)
activemodel (= 4.2.5)
activerecord (= 4.2.5)
activesupport (= 4.2.5)
rails (4.2.5.1)
actionmailer (= 4.2.5.1)
actionpack (= 4.2.5.1)
actionview (= 4.2.5.1)
activejob (= 4.2.5.1)
activemodel (= 4.2.5.1)
activerecord (= 4.2.5.1)
activesupport (= 4.2.5.1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.5)
railties (= 4.2.5.1)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
@ -231,17 +231,17 @@ GEM
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-i18n (4.0.8)
i18n (~> 0.7)
railties (~> 4.0)
railties (4.2.5)
actionpack (= 4.2.5)
activesupport (= 4.2.5)
railties (4.2.5.1)
actionpack (= 4.2.5.1)
activesupport (= 4.2.5.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.0.0)
rainbow (2.1.0)
rake (10.5.0)
redcarpet (3.3.4)
ref (2.0.0)
@ -351,7 +351,7 @@ DEPENDENCIES
r2
rack-cors
rack-uri_sanitizer
rails (= 4.2.5)
rails (= 4.2.5.1)
rails-i18n (~> 4.0.0)
redcarpet
rinku (>= 1.2.2)
@ -359,6 +359,7 @@ DEPENDENCIES
sanitize
sass-rails (~> 5.0)
soap4r-ruby1.9
sprockets-rails (< 3)
timecop
uglifier (>= 1.3.0)
validates_email_format_of (>= 1.5.1)

4
config/initializers/r2.rb
View file

@ -18,4 +18,6 @@ class R2Template < Tilt::Template
end
end
Rails.application.assets.register_engine ".r2", R2Template
Rails.application.config.assets.configure do |env|
env.register_engine ".r2", R2Template
end