Skip to content

Commit

Permalink
update to rails 2.3.14
Browse files Browse the repository at this point in the history
  • Loading branch information
weijen committed Nov 7, 2011
1 parent 3cd694f commit de3dd3a
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 23 deletions.
1 change: 1 addition & 0 deletions Gemfile
@@ -1,5 +1,6 @@
source :gemcutter source :gemcutter
gem "rails", "~> 2.3.11" gem "rails", "~> 2.3.11"
gem 'rdoc'




# bundler requires these gems in all environments # bundler requires these gems in all environments
Expand Down
36 changes: 20 additions & 16 deletions Gemfile.lock
@@ -1,26 +1,29 @@
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
actionmailer (2.3.12) actionmailer (2.3.14)
actionpack (= 2.3.12) actionpack (= 2.3.14)
actionpack (2.3.12) actionpack (2.3.14)
activesupport (= 2.3.12) activesupport (= 2.3.14)
rack (~> 1.1.0) rack (~> 1.1.0)
activerecord (2.3.12) activerecord (2.3.14)
activesupport (= 2.3.12) activesupport (= 2.3.14)
activeresource (2.3.12) activeresource (2.3.14)
activesupport (= 2.3.12) activesupport (= 2.3.14)
activesupport (2.3.12) activesupport (2.3.14)
json (1.6.1)
pg (0.11.0) pg (0.11.0)
rack (1.1.2) rack (1.1.2)
rails (2.3.12) rails (2.3.14)
actionmailer (= 2.3.12) actionmailer (= 2.3.14)
actionpack (= 2.3.12) actionpack (= 2.3.14)
activerecord (= 2.3.12) activerecord (= 2.3.14)
activeresource (= 2.3.12) activeresource (= 2.3.14)
activesupport (= 2.3.12) activesupport (= 2.3.14)
rake (>= 0.8.3) rake (>= 0.8.3)
rake (0.9.2) rake (0.9.2.2)
rdoc (3.11)
json (~> 1.4)
sqlite3 (1.3.4) sqlite3 (1.3.4)
sqlite3-ruby (1.3.3) sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3) sqlite3 (>= 1.3.3)
Expand All @@ -31,4 +34,5 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
pg pg
rails (~> 2.3.11) rails (~> 2.3.11)
rdoc
sqlite3-ruby sqlite3-ruby
2 changes: 1 addition & 1 deletion Rakefile
Expand Up @@ -5,6 +5,6 @@ require(File.join(File.dirname(__FILE__), 'config', 'boot'))


require 'rake' require 'rake'
require 'rake/testtask' require 'rake/testtask'
require 'rake/rdoctask' require 'rdoc/task'


require 'tasks/rails' require 'tasks/rails'
4 changes: 3 additions & 1 deletion app/views/expenses/_form.html.erb
Expand Up @@ -14,7 +14,9 @@
<% content_for :page_specific_javascript do -%> <% content_for :page_specific_javascript do -%>
<script type="text/javascript"> <script type="text/javascript">
var option = {dateFormat: 'yy-mm-dd'}; var option = {dateFormat: 'yy-mm-dd',
numberOfMonths: 2,
showButtonPanel: true};


$(document).ready(function(){ $(document).ready(function(){
$('#expense_entry_date').datepicker(option); $('#expense_entry_date').datepicker(option);
Expand Down
11 changes: 7 additions & 4 deletions app/views/group_expenses/_form.html.erb
Expand Up @@ -7,9 +7,12 @@
<% content_for :page_specific_javascript do -%> <% content_for :page_specific_javascript do -%>
<script type="text/javascript"> <script type="text/javascript">
var option = {dateFormat: 'yy-mm-dd'}; var option = {dateFormat: 'yy-mm-dd',
$(document).ready(function(){ numberOfMonths: 2,
$('#expense_entry_date').datepicker(option); showButtonPanel: true
}); };
$(document).ready(function(){
$('#expense_entry_date').datepicker(option);
});
</script> </script>
<% end -%> <% end -%>
2 changes: 1 addition & 1 deletion config/environment.rb
@@ -1,7 +1,7 @@
# Be sure to restart your server when you modify this file # Be sure to restart your server when you modify this file


# Specifies gem version of Rails to use when vendor/rails is not present # 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 # Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot') require File.join(File.dirname(__FILE__), 'boot')
Expand Down

0 comments on commit de3dd3a

Please sign in to comment.