public
Fork of lazyatom/engines
Description: The Rails Engines plugin
Homepage: http://rails-engines.org
Clone URL: git://github.com/azimux/engines.git
Search Repo:
added changes to cope with edge rails.
azimux (author)
Tue Jul 22 00:38:05 -0700 2008
commit  91a5fc1247c82f78c22134f41a5e25ed99436b7a
tree    bf483dc64126d4b1ada16b42e4f06af9dd191283
parent  e1bbe67ae18a921a9c658bbbfb50bf9e78d28ab5
...
1
2
3
4
 
 
...
1
2
 
3
4
5
0
@@ -1,3 +1,4 @@
0
 .DS_Store
0
 test_app
0
-doc
0
\ No newline at end of file
0
+doc
0
+.svn
...
89
90
91
92
 
93
94
95
...
89
90
91
 
92
93
94
95
0
@@ -89,7 +89,7 @@ module Engines
0
       view_path = File.join(directory, 'app', 'views')
0
       if File.exist?(view_path)
0
         ActionController::Base.view_paths.insert(1, view_path) # push it just underneath the app
0
- ActionView::TemplateFinder.process_view_paths(view_path)
0
+ ActionView::Base.process_view_paths(view_path)
0
       end
0
     end
0
 
...
140
141
142
143
 
144
145
146
...
140
141
142
 
143
144
145
146
0
@@ -140,6 +140,6 @@ module Engines::RailsExtensions::Dependencies
0
   end
0
 end
0
 
0
-module ::Dependencies #:nodoc:
0
+module ActiveSupport::Dependencies #:nodoc:
0
   include Engines::RailsExtensions::Dependencies
0
 end
0
\ No newline at end of file

Comments

  • lazyatom Tue Jul 22 03:41:13 -0700 2008

    I think some of these changes would’ve been available by just rebasing against my edge branch (http://github.com/lazyatom/engines/commits/edge) – no worries though :)

  • azimux Tue Jul 22 03:58:47 -0700 2008

    yeah I actually just realized that yesterday :P

    Today I switched to your edge branch and merged my other branches into that, and rolled back my master branch and this commit is no longer on the master branch. Is it maybe dangling now? Not sure but yeah, I’m on your edge branch now :)

    I’m new to git/engines but starting to understand the work flow better

  • azimux Tue Jul 22 04:02:30 -0700 2008

    Yeah I just checked and this commit is no longer in my master or edge

    How did you even find this thing to comment on? :P I’m pretty sure I had cleaned it up hours before you posted :)