Skip to content

Commit 61b5619

Browse files
committed
support for rails 4.0
1 parent c1e650e commit 61b5619

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
script: bundle exec rspec spec
2+
env:
3+
matrix:
4+
- RAILS=4.0.13
5+
- RAILS=4.1.5
6+
- RAILS=4.2.6
27
rvm:
38
- 2.1.5
49
- 2.2.0

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
44
gemspec
55
group :test do
66
gem 'sprockets-rails', '2.3.3'
7-
gem 'rails', '4.2.0'
7+
gem 'rails', "#{ENV['RAILS']}" || '4.2.6'
88
gem 'rspec-rails'
99
gem 'activeadmin', github: 'activeadmin' , ref: 'd787029e5523be2eb2ed99816eb0cecca2b72862'
1010
gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io

lib/active_admin_datetimepicker/base.rb

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
module ActiveAdminDatetimepicker
22
module Base
3-
mattr_accessor :default_datetime_picker_options do
4-
{}
5-
end
6-
7-
mattr_accessor :format do
8-
'%Y-%m-%d %H:%M'
9-
end
3+
mattr_accessor :default_datetime_picker_options
4+
@@default_datetime_picker_options = {}
5+
mattr_accessor :format
6+
@@format = '%Y-%m-%d %H:%M'
107

118
def html_class
129
'date-time-picker'

0 commit comments

Comments
 (0)