Skip to content

Commit

Permalink
support for rails 4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Fivell committed Jun 14, 2016
1 parent c1e650e commit cd00b57
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
@@ -1,4 +1,9 @@
script: bundle exec rspec spec
env:
matrix:
- RAILS=4.0.13
- RAILS=4.1.5
- RAILS=4.2.6
rvm:
- 2.1.5
- 2.2.0
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Expand Up @@ -3,8 +3,9 @@ source 'https://rubygems.org'
# Specify your gem's dependencies in active_admin_datetimepicker.gemspec
gemspec
group :test do
default_rails_version = '4.2.6'
gem 'sprockets-rails', '2.3.3'
gem 'rails', '4.2.0'
gem 'rails', "#{ENV['RAILS'] || default_rails_version}"
gem 'rspec-rails'
gem 'activeadmin', github: 'activeadmin' , ref: 'd787029e5523be2eb2ed99816eb0cecca2b72862'
gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
Expand Down
11 changes: 4 additions & 7 deletions lib/active_admin_datetimepicker/base.rb
@@ -1,12 +1,9 @@
module ActiveAdminDatetimepicker
module Base
mattr_accessor :default_datetime_picker_options do
{}
end

mattr_accessor :format do
'%Y-%m-%d %H:%M'
end
mattr_accessor :default_datetime_picker_options
@@default_datetime_picker_options = {}
mattr_accessor :format
@@format = '%Y-%m-%d %H:%M'

def html_class
'date-time-picker'
Expand Down
2 changes: 1 addition & 1 deletion lib/active_admin_datetimepicker/version.rb
@@ -1,3 +1,3 @@
module ActiveAdminDatetimepicker
VERSION = '0.2.0'
VERSION = '0.3.0'
end

0 comments on commit cd00b57

Please sign in to comment.