Upgrade enki to rails 3.1 #39

Closed
wants to merge 11 commits into
from

Projects

None yet

3 participants

@amw
Contributor
amw commented Jul 25, 2011

Please test and comment.

@xaviershay xaviershay commented on an outdated diff Jul 25, 2011
config/application.rb
# JavaScript files you want as :defaults (application.js is always included).
- config.action_view.javascript_expansions[:defaults] = %w()
+ config.action_view.javascript_expansions[:defaults] = %w(prototype prototype_ujs)
@xaviershay
xaviershay Jul 25, 2011 Owner

why this addition? Not using prototype...

@xaviershay xaviershay commented on an outdated diff Jul 25, 2011
config/environments/test.rb
@@ -1,5 +1,5 @@
-Enki::Application.configure do
- # Settings specified here will take precedence over those in config/environment.rb
+CcOscar::Application.configure do
@xaviershay
xaviershay Jul 25, 2011 Owner

I think this is a mistake, needs to be reverted to Enki

@amw
Contributor
amw commented Jul 25, 2011

Thanks for pointing those out. I'm leaving the line with prototype statements commented out - this is how you find it in a fresh rails 3.1 app. We don't use default javascript include anyway.

@xaviershay
Owner

Excellent, thanks for this. I'm going to wait for 3.1 final release before merging this in.

@rweng
rweng commented Aug 31, 2011

Rails 3.1 is out by today

Adam Wróbel added some commits Sep 20, 2011
Adam Wróbel Require sprockets.
Required by rails 3.1 when not using "rails/all".
4a6e3d8
Adam Wróbel Remove unused file.
This file is included and updated in jquery-rails gem.
8741732
Adam Wróbel Merge remote-tracking branch 'enki_upstream/master' into rails31 bc0c1b5
Adam Wróbel Add admin.css and login.css to production env. db0ffe7
Adam Wróbel Better rails 3.1 configuration. 55a1056
Adam Wróbel Merge remote-tracking branch 'enki_upstream/master' into rails31 38b5c32
@xaviershay
Owner

Closing, master is now 3.2.

@xaviershay xaviershay closed this Feb 18, 2012
@xaviershay
Owner

Really sorry I never merged this by the way, I've just been slack. Thanks for the contribution.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment