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

Support for rails 6 #2163

Merged
merged 9 commits into from Oct 11, 2019
Merged

Support for rails 6 #2163

merged 9 commits into from Oct 11, 2019

Conversation

jcoyne
Copy link
Member

@jcoyne jcoyne commented Oct 3, 2019

No description provided.

@jcoyne jcoyne force-pushed the rails-6-take2 branch 3 times, most recently from 83f1517 to e0f9e33 Compare October 3, 2019 15:27
@jcoyne jcoyne mentioned this pull request Oct 3, 2019
Closed
@jcoyne jcoyne marked this pull request as ready for review October 3, 2019 15:43
@jcoyne jcoyne changed the title Rails 6 take2 Support for rails 6 Oct 3, 2019
@jcoyne jcoyne force-pushed the rails-6-take2 branch 2 times, most recently from d4e54d1 to 7f97a52 Compare October 3, 2019 23:12
@jcoyne jcoyne mentioned this pull request Oct 6, 2019
Closed
cjcolvar
cjcolvar reviewed Oct 10, 2019
View reviewed changes
Copy link
Contributor

@cjcolvar cjcolvar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks fine to me, but it would probably be good to get others to take a look especially at the sprockets setup.

spec/views/catalog/_show_tools.html.erb_spec.rb Outdated Show resolved Hide resolved
app/views/catalog/_constraints_element.html.erb Outdated Show resolved Hide resolved
blacklight.gemspec Show resolved Hide resolved
@jcoyne jcoyne force-pushed the rails-6-take2 branch 2 times, most recently from 90ca454 to 74a0cbb Compare October 10, 2019 17:15
cjcolvar
cjcolvar approved these changes Oct 10, 2019
View reviewed changes
Copy link
Contributor

@cjcolvar cjcolvar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@bess bess merged commit 9850554 into master Oct 11, 2019
@bess bess deleted the rails-6-take2 branch October 11, 2019 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bess bess bess approved these changes

@cjcolvar cjcolvar cjcolvar approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jcoyne @bess @cjcolvar