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

Migrate to Sprockets 4. #21132

Merged
merged 1 commit into from Aug 19, 2015
Merged

Migrate to Sprockets 4. #21132

merged 1 commit into from Aug 19, 2015

Conversation

Andreis13
Copy link
Contributor

@@ -0,0 +1,4 @@

//= link_tree ./images
//= link ./javascripts/application
Copy link
Member

Choose a reason for hiding this comment

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

I remember we had problems because we didn't make explicit the extension right?

@@ -20,7 +20,7 @@ gem 'turbolinks'
gem 'arel', github: 'rails/arel', branch: 'master'
gem 'mail', github: 'mikel/mail'

gem 'sprockets', '~> 3.0.0.rc.1'
gem 'sprockets', github: 'rails/sprockets', branch: 'master'
Copy link
Member

Choose a reason for hiding this comment

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

Do we need to add sass-rails master here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Perhaps we could add it here also, it is already present in the Gemfiles of the generated applications and I don't fully understand what gems should be present in Gemfile for the rails gem itself, so I didn't include it because no test was failing because of this.

Copy link
Member

Choose a reason for hiding this comment

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

If we need on generate Gemfiles we need here too. The Railties tests use this Gemfile instead of the generated one.

@Andreis13 Andreis13 force-pushed the sprockets-4 branch 4 times, most recently from 754d76a to 1926b1f Compare August 18, 2015 02:33
rafaelfranca added a commit that referenced this pull request Aug 19, 2015
@rafaelfranca rafaelfranca merged commit 3ee7c57 into rails:master Aug 19, 2015
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

2 participants