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.

Sign up for GitHub

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

Jump to bottom

Rails 5 #656

Closed
wants to merge 25 commits into from
Closed

Rails 5 #656

wants to merge 25 commits into from

Conversation

v-kumar
Copy link

@v-kumar v-kumar commented Sep 11, 2016

  1. Merge latest master
  2. Update sass-3-4 Gemfile to fix assert_template dependency error on rails-controller-testing gem.
  3. Update rubocop defs to support latest rubocop.
  4. Make specs pass in all appraisals.

teoljungberg and others added 19 commits July 8, 2016 10:58
@teoljungberg
Upgrade rspec-rails
10a664a
@teoljungberg
Use fork of administrate-field-image
8555ecf 
Which relaxes the version requirement for Rails.
@teoljungberg
Lax Rails version requirement
d5afa35 
- Lock in `4.2 < Rails::VERSION < 5.1`
@teoljungberg
Add appraisals for rails 4.2 and 5.0
6667398 
- Add binstub for appraisal.
@teoljungberg
Only remove the XML parser if < Rails 5
b4522fb
@teoljungberg
Remove unused helper
2aa9677
@teoljungberg
Upgrade ActionController configuration for Rails 5
9f2e80a
@teoljungberg
Only set raise_in_transactional_callbacks if < Rails 5
b204616 
The option is deprecated in Rails 5.
@teoljungberg
Configure serving public assets to work with Rails 4 and 5
38076b9
@teoljungberg
Add HTTP method shims
83bcab0 
This provides backwards compatibility from Rails 5 to 4.

Inspiration:
- thoughtbot/clearance#639
- https://github.com/thoughtbot/high_voltage/pull/229/files
@teoljungberg
"Sanitize" order parameters to quell warnings
e44bba4
@teoljungberg
Replace column_types
a45d2de 
It was removed in rails/rails@70ac072.
@teoljungberg
Set active_record.time_zone_aware_types for Rails 5
5ac9ddb
@teoljungberg
fixup! Use fork of administrate-field-image
c4922bf
@v-kumar
Merge remote-tracking branch 'origin/master' into rails-5
d2ef3d1
@v-kumar
per: thoughtbot@5227c9b
5f52179
@v-kumar
Update rubocop definitions to the latest
c12a6ee
@v-kumar
fix assert_template dependency for rails-controller-testing
cd591ca
@v-kumar
add rails-controller-testing gemfile to appraisal
a8500eb
@v-kumar
Copy link
Author

v-kumar commented Sep 12, 2016

@teoljungberg I updated the appraisal config and also rebased(merged) with master to get the tests pass. Please review and consider merging it to your branch. This way, everybody can have a single up-to-date place for the rails5 branch.

@joshuamcginnis
Copy link

Thanks @v-kumar. Changes look good! LGTM 👍

@pedantic-git pedantic-git mentioned this pull request Oct 17, 2016
Closed
@teoljungberg
Copy link
Contributor

@v-kumar Since #636 was merged, aslong with other PRs to get Administrate on to Rails 5. I think you can safely close this PR as the matter is being worked on.

@JoelQ JoelQ closed this Oct 28, 2016
@JoelQ
Copy link
Contributor

JoelQ commented Oct 28, 2016

Version 0.3.0 9f323e9 will soon be released with Rails 5 support.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@v-kumar @joshuamcginnis @teoljungberg @JoelQ @danbee