deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

upgrade to newest activesupport

Browse source
This commit is contained in:
Thomas Reynolds 2014-01-02 14:38:18 -08:00
parent 515c91e826
commit ae1edd482f
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
middleman-core/lib/middleman-core/application.rb
View file

@ -11,7 +11,6 @@ require 'i18n'
# Use ActiveSupport JSON # Use ActiveSupport JSON
require 'active_support/json' require 'active_support/json'
require 'active_support/core_ext/integer/inflections' require 'active_support/core_ext/integer/inflections'
require 'active_support/core_ext/float/rounding'
# Simple callback library # Simple callback library
require 'hooks' require 'hooks'

4
middleman-core/lib/middleman-core/logger.rb
View file

@ -1,12 +1,12 @@
# Use the Ruby/Rails logger # Use the Ruby/Rails logger
require 'active_support/notifications' require 'active_support/notifications'
require 'active_support/buffered_logger' require 'active_support/logger'
require 'thread' require 'thread'
module Middleman module Middleman
# The Middleman Logger # The Middleman Logger
class Logger < ActiveSupport::BufferedLogger class Logger < ActiveSupport::Logger
def self.singleton(*args) def self.singleton(*args)
if !@_logger || args.length > 0 if !@_logger || args.length > 0

2
middleman-core/middleman-core.gemspec
View file

@ -32,7 +32,7 @@ Gem::Specification.new do |s|
s.add_dependency("thor", [">= 0.15.2", "< 2.0"]) s.add_dependency("thor", [">= 0.15.2", "< 2.0"])
# Helpers # Helpers
s.add_dependency("activesupport", ["~> 3.2.6"]) s.add_dependency("activesupport", ["~> 4.0.1"])
# Watcher # Watcher
s.add_dependency("listen", ["~> 1.1"]) s.add_dependency("listen", ["~> 1.1"])