-
Notifications
You must be signed in to change notification settings - Fork 197
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
Drops action_filter support #276
Conversation
Yep! Shall we update the Travis CI matrix to disallow unsupported Rails' versions, and do a major release? Thanks! |
Related with: #274. We'll also want to update the gemspec. |
I'm looking at that travis build now. |
I'm fine ignoring most Hound comments in this PR. Thanks for your work! |
@tute What do you think about this case statement from the Gemfile. Looks like it will be dead code too:
|
Yep! We can delete the |
Cool, will do. Also, there is something I don't understand about travis. Why is it running versions of rails other than what I have specified on this branch? Is it also using the master version of the |
It looks like! Shouldn't be running 4.2. Let's ignore those for now. |
Don't forget it seems we can clean up some code in |
I'd rather keep 5 if we can. 5.0 and 5.1 are similar enough for us. |
I was getting 'ArgumentError: key must be 32 byte' when running against 5.0.0.0. Oddly enough I can't reproduce that again. I'll give travis another chance at ~> 5.0, and fix that test.rb file. |
Dropping that from the dummy env files causes:
But turning off warnings seems nice. Sending another build |
I'm stuck on this failure right now: https://travis-ci.org/merit-gem/merit/jobs/254626719 |
@tute could use some input, running out of easy fix ideas for this:
What do you think? |
Apparently minitest 5.10.2 has an issue. We can specify versions minitest '~> 5.10', '!= 5.10.2', or later. |
Making progress. Just some trial and error finding the lowest rails 5 version to support. |
@tute if you agree, can you click resolve on that travis file? |
aha, that means your branch was born before latest master. Can you please squash your commits together, and rebase them on top of latest master? I wrote instructions for this in https://robots.thoughtbot.com/git-interactive-rebase-squash-amend-rewriting-history. That'd resolve the conflicts in the process. Let me know if I can help you do this. Thanks for all the work! :) |
Rakefile
Outdated
t.pattern = 'test/**/*_test.rb' | ||
t.verbose = true | ||
t.pattern = 'test/**/*_test.rb' | ||
t.verbose = true |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No need of the extra white space here
else | ||
base.after_filter :log_and_process | ||
end | ||
base.after_action :log_and_process |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes!
.travis.yml
Outdated
|
||
env: | ||
- RAILS_VERSION=5.0 | ||
- RAILS_VERSION=5.0.3 | ||
- RAILS_VERSION=5.1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There will be changes to merge from latest master, when you rebase you'll see them.
This change drops some version specific code as well as moving the dummy test app to be rails 5 compatible.
e0351db
to
dd7b05a
Compare
@@ -1,4 +1,4 @@ | |||
class CreatePlayers < ActiveRecord::Migration | |||
class CreatePlayers < ActiveRecord::Migration[5.0] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing magic comment # frozen_string_literal: true.
@@ -1,4 +1,4 @@ | |||
class AddTargetDataToMeritActions < ActiveRecord::Migration | |||
class AddTargetDataToMeritActions < ActiveRecord::Migration[5.0] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing magic comment # frozen_string_literal: true.
@@ -1,4 +1,4 @@ | |||
class CreateAddresses < ActiveRecord::Migration | |||
class CreateAddresses < ActiveRecord::Migration[5.0] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing magic comment # frozen_string_literal: true.
@@ -1,4 +1,4 @@ | |||
class CreateScoresAndPoints < ActiveRecord::Migration | |||
class CreateScoresAndPoints < ActiveRecord::Migration[5.0] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing magic comment # frozen_string_literal: true.
@@ -1,4 +1,4 @@ | |||
class CreateBadgesSashes < ActiveRecord::Migration | |||
class CreateBadgesSashes < ActiveRecord::Migration[5.0] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing magic comment # frozen_string_literal: true.
@@ -1,4 +1,4 @@ | |||
class CreateMeritActions < ActiveRecord::Migration | |||
class CreateMeritActions < ActiveRecord::Migration[5.0] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing magic comment # frozen_string_literal: true.
@@ -1,4 +1,4 @@ | |||
class AddFieldsToComments < ActiveRecord::Migration | |||
class AddFieldsToComments < ActiveRecord::Migration[5.0] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing magic comment # frozen_string_literal: true.
@@ -1,4 +1,4 @@ | |||
class AddFieldsToUsers < ActiveRecord::Migration | |||
class AddFieldsToUsers < ActiveRecord::Migration[5.0] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing magic comment # frozen_string_literal: true.
@@ -1,4 +1,4 @@ | |||
class CreateComments < ActiveRecord::Migration | |||
class CreateComments < ActiveRecord::Migration[5.0] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing magic comment # frozen_string_literal: true.
@@ -1,4 +1,4 @@ | |||
class CreateUsers < ActiveRecord::Migration | |||
class CreateUsers < ActiveRecord::Migration[5.0] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing magic comment # frozen_string_literal: true.
@tute ok, git surgery done. I think this might be ready for a final review. Thanks for being responsive ! It's a lot more fun when someone is working with me. |
Thanks a lot! :) |
This small change fixes the rails 5.1.2 error, and hard codes the
after_action
callback.