Merge branch 'rails3' of git://github.com/resolve/refinerycms into ra…

…ils3

Gemfile

@@ -17,21 +17,28 @@ gem 'sqlite3-ruby', '~> 1.3', :require => 'sqlite3' # db_adapter=sqlite3
 # gem 'aws-s3'
 
 # REFINERY CMS ================================================================
-# Add i18n support
-gem 'routing-filter'
-
 # Specify the Engines to use:
 path 'vendor/refinerycms' do
-  gem 'refinerycms-core', :require => 'refinery'
+  gem 'refinerycms-core',           :require => 'core'
   gem 'refinerycms-authentication', :require => 'authentication'
-  gem 'refinerycms-dashboard', :require => 'dashboard'
-  gem 'refinerycms-inquiries', :require => 'inquiries'
-  gem 'refinerycms-images', :require => 'images'
-  gem 'refinerycms-pages', :require => 'pages'
-  gem 'refinerycms-resources', :require => 'resources'
-  gem 'refinerycms-settings', :require => 'settings'
+  gem 'refinerycms-dashboard',      :require => 'dashboard'
+  gem 'refinerycms-inquiries',      :require => 'inquiries'
+  gem 'refinerycms-images',         :require => 'images'
+  gem 'refinerycms-pages',          :require => 'pages'
+  gem 'refinerycms-resources',      :require => 'resources'
+  gem 'refinerycms-settings',       :require => 'settings'
 end
 
+# Add i18n support
+gem 'refinerycms-i18n', :git => 'git://github.com/resolve/refinerycms-i18n.git',
+                        :branch => 'master',
+                        :require => 'refinery/i18n'
+gem 'routing-filter'
+
+# Add acts_as_tree support
+gem 'acts_as_tree',     :git => 'git://github.com/parndt/acts_as_tree.git',
+                        :branch => 'master'
+
 # Specify additional Refinery CMS Engines here:
 # gem 'refinerycms-news',       '~> 0.9.8', :require => 'news'
 # gem 'refinerycms-portfolio',  '~> 0.9.7', :require => 'portfolio'

Gemfile.lock

@@ -1,11 +1,25 @@
+GIT
+  remote: git://github.com/parndt/acts_as_tree.git
+  revision: cd4d6a6
+  branch: master
+  specs:
+    acts_as_tree (0.9.8)
+
 GIT
   remote: git://github.com/parndt/dragonfly.git
-  revision: 1e86f21
+  revision: d631373
   branch: refactor_job
   specs:
     dragonfly (0.6.2)
       rack
 
+GIT
+  remote: git://github.com/resolve/refinerycms-i18n.git
+  revision: a8560c9
+  branch: master
+  specs:
+    refinerycms-i18n (0.9.8)
+
 PATH
   remote: vendor/refinerycms
   specs:
@@ -88,7 +102,7 @@ GEM
       term-ansicolor (~> 1.0.4)
     cucumber-rails (0.3.2)
       cucumber (>= 0.8.0)
-    culerity (0.2.10)
+    culerity (0.2.12)
     database_cleaner (0.5.2)
     diff-lcs (1.1.2)
     erubis (2.6.6)
@@ -115,7 +129,7 @@ GEM
     rack (1.2.1)
     rack-cache (0.5.2)
       rack (>= 0.4)
-    rack-mount (0.6.9)
+    rack-mount (0.6.11)
       rack (>= 1.0.0)
     rack-test (0.5.4)
       rack (>= 1.0)
@@ -161,7 +175,7 @@ GEM
       polyglot (>= 0.3.1)
     trollop (1.16.2)
     truncate_html (0.4.0)
-    tzinfo (0.3.22)
+    tzinfo (0.3.23)
     webrat (0.7.2.beta.1)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
@@ -172,6 +186,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  acts_as_tree!
   capybara
   cucumber
   cucumber-rails
@@ -184,6 +199,7 @@ DEPENDENCIES
   refinerycms-authentication!
   refinerycms-core!
   refinerycms-dashboard!
+  refinerycms-i18n!
   refinerycms-images!
   refinerycms-inquiries!
   refinerycms-pages!

Rakefile

@@ -1,10 +1,7 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-require File.expand_path('../config/environment', __FILE__)
 
+require File.expand_path('../config/application', __FILE__)
 require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
 
-require 'tasks/refinery'
 Refinery::Application.load_tasks

app/controllers/application_controller.rb

@@ -4,4 +4,5 @@
 # You can extend refinery with your own functions here and they will likely not get overriden in an update.
 
 class ApplicationController < Refinery::ApplicationController
+
 end