Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/rocket_pants/railtie.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class Railtie < Rails::Railtie
config.rocket_pants.pass_through_errors = nil
config.rocket_pants.pass_through_errors = nil

config.i18n.railties_load_path << File.expand_path('../locale/en.yml', __FILE__)
config.i18n.load_path << File.expand_path('../locale/en.yml', __FILE__)

initializer "rocket_pants.logger" do
ActiveSupport.on_load(:rocket_pants) { self.logger ||= Rails.logger }
Expand Down Expand Up @@ -54,4 +54,4 @@ class Railtie < Rails::Railtie
end

end
end
end
12 changes: 6 additions & 6 deletions rocket_pants.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ Gem::Specification.new do |s|
s.description = "Rocket Pants adds JSON API love to Rails and ActionController, making it simpler to build API-oriented controllers."
s.required_rubygems_version = ">= 1.3.6"

s.add_dependency 'actionpack', '>= 3.0', '< 5.0'
s.add_dependency 'railties', '>= 3.0', '< 5.0'
s.add_dependency 'actionpack', '>= 3.0', '< 6.0'
s.add_dependency 'railties', '>= 3.0', '< 6.0'
s.add_dependency 'will_paginate', '~> 3.0'
s.add_dependency 'hashie', '>= 1.0', '< 3'
s.add_dependency 'api_smith'
s.add_dependency 'moneta'
s.add_development_dependency 'rspec', '>= 2.4', '< 4.0'
s.add_development_dependency 'rspec-rails', '>= 2.4', '< 4.0'
s.add_development_dependency 'rspec', '>= 2.4', '< 6.0'
s.add_development_dependency 'rspec-rails', '>= 2.4', '< 6.0'
s.add_development_dependency 'rr', '~> 1.0'
s.add_development_dependency 'webmock'
s.add_development_dependency 'activerecord', '>= 3.0', '< 5.0'
s.add_development_dependency 'activerecord', '>= 3.0', '< 6.0'
s.add_development_dependency 'sqlite3'
s.add_development_dependency 'reversible_data', '~> 1.0'
s.add_development_dependency 'kaminari'

s.files = Dir.glob("{lib}/**/*")
s.require_path = 'lib'
end
end