Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rails 5 #656

Closed
wants to merge 25 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
10a664a
Upgrade `rspec-rails`
teoljungberg Jul 7, 2016
8555ecf
Use fork of `administrate-field-image`
teoljungberg Jul 8, 2016
d5afa35
Lax Rails version requirement
teoljungberg Jul 8, 2016
6667398
Add appraisals for rails 4.2 and 5.0
teoljungberg Jul 8, 2016
b4522fb
Only remove the XML parser if < Rails 5
teoljungberg Jul 8, 2016
2aa9677
Remove unused helper
teoljungberg Jul 8, 2016
9f2e80a
Upgrade `ActionController` configuration for Rails 5
teoljungberg Aug 1, 2016
b204616
Only set `raise_in_transactional_callbacks` if < Rails 5
teoljungberg Aug 1, 2016
38076b9
Configure serving public assets to work with Rails 4 and 5
teoljungberg Aug 1, 2016
83bcab0
Add HTTP method shims
teoljungberg Aug 1, 2016
e44bba4
"Sanitize" order parameters to quell warnings
teoljungberg Aug 1, 2016
a45d2de
Replace `column_types`
teoljungberg Aug 1, 2016
5ac9ddb
Set `active_record.time_zone_aware_types` for Rails 5
teoljungberg Aug 1, 2016
c4922bf
fixup! Use fork of `administrate-field-image`
teoljungberg Aug 1, 2016
d2ef3d1
Merge remote-tracking branch 'origin/master' into rails-5
v-kumar Sep 11, 2016
5f52179
per: https://github.com/thoughtbot/administrate/commit/5227c9bc5b2090…
v-kumar Sep 11, 2016
c12a6ee
Update rubocop definitions to the latest
v-kumar Sep 11, 2016
cd591ca
fix assert_template dependency for rails-controller-testing
v-kumar Sep 11, 2016
a8500eb
add rails-controller-testing gemfile to appraisal
v-kumar Sep 12, 2016
84096ca
Update changelog to reflect recent merges
danbee Oct 4, 2016
e533a60
Remove bundler version from lock file
danbee Oct 15, 2016
ae9de7d
Merge remote-tracking branch 'upstream/master' into rails-5
v-kumar Oct 17, 2016
a6e3630
Use sanitized_order_params instead of params to avoid "Attempting to …
v-kumar Oct 17, 2016
73d4d55
Fix the specs with the Rails 5 branch and the clear search button (#671)
danbee Oct 19, 2016
58e6347
Merge remote-tracking branch 'upstream/master' into rails-5
v-kumar Oct 23, 2016
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
Prev Previous commit
Next Next commit
Set active_record.time_zone_aware_types for Rails 5
  • Loading branch information
teoljungberg committed Aug 1, 2016
commit 5ac9ddb43e59d6af3984daa83c29a2d66160864e
4 changes: 4 additions & 0 deletions spec/example_app/config/application.rb
Original file line number Diff line number Diff line change
@@ -50,5 +50,9 @@ class Application < Rails::Application
# Do not swallow errors in after_commit/after_rollback callbacks.
config.active_record.raise_in_transactional_callbacks = true
end

if Rails::VERSION::MAJOR >= 5
config.active_record.time_zone_aware_types = [:datetime, :time]
end
end
end