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 6 minor + Sprockets Config Update (assets.rb) #48

Merged
merged 9 commits into from
Jul 10, 2020

Conversation

masonhensley
Copy link
Contributor

@masonhensley masonhensley commented Jan 21, 2020

Rebased against #47 (documentation update) and giving a shot at Travis tests to carry the torch on mrsweater's work in #45

Will close #47 if this goes green.

Fixes #44

FYI

  • Had to update assets.rb & manifest.js to make the latest version of sprockets happy. Was receiving errors like this

  • Updated Apprisals & Documentation for future contributors

Notes about documentation update:

... Quick documentation update for future contributors based on feedback in #46 & #45

  • Updated contribution documentation
  • Added ruby 2.6.4 to travis pipelines matrix for Rails 6

Update

Ready for review. Thanks for the project 🎉

@coveralls
Copy link

coveralls commented Jan 21, 2020

Pull Request Test Coverage Report for Build 174

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 1 unchanged line in 1 file lost coverage.
  • Overall coverage increased (+0.1%) to 94.193%

Files with Coverage Reduction New Missed Lines %
app/helpers/policy_manager/terms_helper.rb 1 60.0%
Totals Coverage Status
Change from base Build 154: 0.1%
Covered Lines: 957
Relevant Lines: 1016

💛 - Coveralls

@masonhensley masonhensley changed the title Rails 6 minor + travis fix WIP: Rails 6 minor + travis fix Jan 22, 2020
gemspec rule for rubyzip compatability with ruby versions less than 2.4
gemfile update via appraisal
rm terms_manifest.js from spec/dummy manifest.js
Rails 6 Sprockets error in travis
updating assets.rb & manifest.js for new sprockets
@masonhensley masonhensley force-pushed the rails-6-minor-travis-fix branch from b8fcc3b to f8f4e72 Compare January 22, 2020 19:56
@masonhensley masonhensley changed the title WIP: Rails 6 minor + travis fix Rails 6 minor + Sprockets Config Update (assets.rb) Jan 22, 2020
@mrsweaters
Copy link
Contributor

mrsweaters commented Feb 24, 2020

@patriciojofre @michelson @matipacheco Is there anything we need to change to get this merged? I know it can be a pain in the ass maintaining a repo, so we want to help as much as possible here (and hopefully not be a hindrance).

@michelson
Copy link
Contributor

I think we are ready to merge, just note the change on .update_attributes with .update , is .update compatible with rails 5.1.4 ?

Le damos @patriciojofre ?

@mrsweaters
Copy link
Contributor

mrsweaters commented Feb 24, 2020

In Rails 5.1.4 update_attributes is an alias of update so it should be fine.
https://api.rubyonrails.org/v5.1.4/classes/ActiveRecord/Persistence.html

@mrsweaters
Copy link
Contributor

Can we get this merged in?

@psnider30
Copy link

Any update on when this is getting merged?

@patriciojofre patriciojofre merged commit 6180180 into prey:master Jul 10, 2020
@patriciojofre
Copy link
Member

sorry guys, PR merged! thanks for contribute to gdpr rails!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rails version too restrictive for Rails 6 patch releases.
6 participants