update to rails 2.3.14

weijen · Nov 7, 2011 · de3dd3a · de3dd3a
1 parent 3cd694f
commit de3dd3a
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 23 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,6 @@
 source :gemcutter
 gem "rails", "~> 2.3.11"
+gem 'rdoc'
 
 
 # bundler requires these gems in all environments

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,26 +1,29 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (2.3.12)
-      actionpack (= 2.3.12)
-    actionpack (2.3.12)
-      activesupport (= 2.3.12)
+    actionmailer (2.3.14)
+      actionpack (= 2.3.14)
+    actionpack (2.3.14)
+      activesupport (= 2.3.14)
       rack (~> 1.1.0)
-    activerecord (2.3.12)
-      activesupport (= 2.3.12)
-    activeresource (2.3.12)
-      activesupport (= 2.3.12)
-    activesupport (2.3.12)
+    activerecord (2.3.14)
+      activesupport (= 2.3.14)
+    activeresource (2.3.14)
+      activesupport (= 2.3.14)
+    activesupport (2.3.14)
+    json (1.6.1)
     pg (0.11.0)
     rack (1.1.2)
-    rails (2.3.12)
-      actionmailer (= 2.3.12)
-      actionpack (= 2.3.12)
-      activerecord (= 2.3.12)
-      activeresource (= 2.3.12)
-      activesupport (= 2.3.12)
+    rails (2.3.14)
+      actionmailer (= 2.3.14)
+      actionpack (= 2.3.14)
+      activerecord (= 2.3.14)
+      activeresource (= 2.3.14)
+      activesupport (= 2.3.14)
       rake (>= 0.8.3)
-    rake (0.9.2)
+    rake (0.9.2.2)
+    rdoc (3.11)
+      json (~> 1.4)
     sqlite3 (1.3.4)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
@@ -31,4 +34,5 @@ PLATFORMS
 DEPENDENCIES
   pg
   rails (~> 2.3.11)
+  rdoc
   sqlite3-ruby
diff --git a/Rakefile b/Rakefile
@@ -5,6 +5,6 @@ require(File.join(File.dirname(__FILE__), 'config', 'boot'))
 
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 require 'tasks/rails'
diff --git a/app/views/expenses/_form.html.erb b/app/views/expenses/_form.html.erb
@@ -14,7 +14,9 @@
 
 <% content_for :page_specific_javascript do -%>
   <script type="text/javascript">
-    var option = {dateFormat: 'yy-mm-dd'};
+      var option = {dateFormat: 'yy-mm-dd',
+                    numberOfMonths: 2,
+			              showButtonPanel: true};
 
     $(document).ready(function(){
         $('#expense_entry_date').datepicker(option);

diff --git a/app/views/group_expenses/_form.html.erb b/app/views/group_expenses/_form.html.erb
@@ -7,9 +7,12 @@
 
 <% content_for :page_specific_javascript do -%>
   <script type="text/javascript">
-    var option = {dateFormat: 'yy-mm-dd'};
-    $(document).ready(function(){
-      $('#expense_entry_date').datepicker(option);
-    });
+      var option = {dateFormat: 'yy-mm-dd',
+          numberOfMonths: 2,
+          showButtonPanel: true
+      };
+      $(document).ready(function(){
+          $('#expense_entry_date').datepicker(option);
+      });
   </script>
 <% end -%>
diff --git a/config/environment.rb b/config/environment.rb
@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.12' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')