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

Upgrade to Rails 6 #1709

Merged
merged 9 commits into from
Nov 6, 2019
Merged

Upgrade to Rails 6 #1709

merged 9 commits into from
Nov 6, 2019

Conversation

barrucadu
Copy link
Contributor

@barrucadu barrucadu commented Nov 1, 2019

@bevanloon bevanloon temporarily deployed to finder-frontend-pr-1709 November 1, 2019 14:30 Inactive
@bevanloon bevanloon temporarily deployed to finder-frontend-pr-1709 November 1, 2019 14:34 Inactive
@bevanloon bevanloon temporarily deployed to finder-frontend-pr-1709 November 1, 2019 14:42 Inactive
@bevanloon bevanloon temporarily deployed to finder-frontend-pr-1709 November 1, 2019 14:51 Inactive
@barrucadu barrucadu marked this pull request as ready for review November 1, 2019 15:00
Copy link
Contributor

@sihugh sihugh left a comment

Choose a reason for hiding this comment

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

Looks great, apart from the Gemfile merge conflicts that have arrived 🙈

@bevanloon bevanloon temporarily deployed to finder-frontend-pr-1709 November 4, 2019 09:31 Inactive
@bevanloon bevanloon temporarily deployed to finder-frontend-pr-1709 November 5, 2019 09:52 Inactive
@bevanloon bevanloon temporarily deployed to finder-frontend-pr-1709 November 5, 2019 11:43 Inactive
Copy link
Contributor

@sihugh sihugh left a comment

Choose a reason for hiding this comment

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

We've got a linting fail now because listen in the Gemfile is not in alphabetical order 😣

@bevanloon bevanloon temporarily deployed to finder-frontend-pr-1709 November 5, 2019 18:17 Inactive
@barrucadu
Copy link
Contributor Author

Another Gemfile conflict! 😱

Using a beta version of rspec-rails due to an upstream bug: we should
switch to 4.0.0 when that's out.
This wasn't covered by the app:update task because this is a custom
initialiser.
This fixes a potential RCE exception, though the app doesn't set
cookies.
We can re-enable this when libsass adds support for min/max.
The app fails to start in govuk-docker without this:

    /[etc]/activesupport-6.0.0/lib/active_support/dependencies.rb:325:
    in `require': Could not load the 'listen' gem.  Add `gem 'listen'`
    to the development group of your Gemfile (LoadError)
@barrucadu barrucadu merged commit 2cd0284 into master Nov 6, 2019
@barrucadu barrucadu deleted the msw/rails-6 branch November 6, 2019 10:14
@sihugh
Copy link
Contributor

sihugh commented Nov 6, 2019

🚀

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.

None yet

4 participants