mirror of
https://github.com/middleman/middleman.git
synced 2022-11-09 12:20:27 -05:00
upgrade to newest activesupport
This commit is contained in:
parent
95eaeba960
commit
d77ef04774
3 changed files with 3 additions and 4 deletions
|
@ -11,7 +11,6 @@ require 'i18n'
|
|||
# Use ActiveSupport JSON
|
||||
require 'active_support/json'
|
||||
require 'active_support/core_ext/integer/inflections'
|
||||
require 'active_support/core_ext/float/rounding'
|
||||
|
||||
# Simple callback library
|
||||
require 'vendored-middleman-deps/hooks-0.2.0/lib/hooks'
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
# Use the Ruby/Rails logger
|
||||
require 'active_support/notifications'
|
||||
require 'active_support/buffered_logger'
|
||||
require 'active_support/logger'
|
||||
require 'thread'
|
||||
|
||||
module Middleman
|
||||
|
||||
# The Middleman Logger
|
||||
class Logger < ActiveSupport::BufferedLogger
|
||||
class Logger < ActiveSupport::Logger
|
||||
|
||||
def self.singleton(*args)
|
||||
if !@_logger || args.length > 0
|
||||
|
|
|
@ -30,7 +30,7 @@ Gem::Specification.new do |s|
|
|||
s.add_dependency("thor", [">= 0.15.2", "< 2.0"])
|
||||
|
||||
# Helpers
|
||||
s.add_dependency("activesupport", ["~> 3.2.6"])
|
||||
s.add_dependency("activesupport", ["~> 4.0.1"])
|
||||
|
||||
# Watcher
|
||||
s.add_dependency("listen", ["~> 1.1"])
|
||||
|
|
Loading…
Reference in a new issue