Skip to content

Commit

Permalink
fix rails version to 3.1.0.rc1 and remove the jquery setting
Browse files Browse the repository at this point in the history
  • Loading branch information
weijen committed May 27, 2011
1 parent e02091d commit 1af9ae3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 13 deletions.
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
source 'http://rubygems.org'

gem 'rails', '3.0.6'

gem 'rails', "3.1.0.rc1"
gem 'rake', '~> 0.8.7'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'

gem 'mysql2'
# gem 'sqlite3-ruby', :require => 'sqlite3'
# gem 'moneta'

gem 'mysql2', '0.3.2'
gem 'yajl-ruby', :require => 'yajl'
gem 'nokogiri'

Expand Down
1 change: 1 addition & 0 deletions devise.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
generate 'devise:install'
say "現在設定devise Model: #{@user_model_name}"
if @user_model_name
generate "devise #{@user_model_name.capitalize}"
append_to_file "db/seeds.rb" do
Expand Down
13 changes: 3 additions & 10 deletions rails3.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# set development database.yml
case options[:database]
when "mysql"
gem "mysql2"
gem "mysql2", "<~ 0.3"
template "#{(File.dirname(__FILE__))}/database/mysql.tt", "config/database.yml"
when "sqlite3"
gem 'sqlite3-ruby', :require => 'sqlite3'
Expand All @@ -42,8 +42,8 @@

# bundle install
begin
run "gem install rails --no-ri --no-rdoc"
run "gem install bundler --no-ri --no-rdoc"
run "gem install rails --pre --no-ri --no-rdoc"
#run "gem install bundler --no-ri --no-rdoc"
rescue
raise "Can't install bundler"
end
Expand Down Expand Up @@ -85,13 +85,6 @@
require 'action_mailer/railtie'
CODE

# install jquery
run "curl -L http://code.jquery.com/jquery.min.js > public/javascripts/jquery.js"
run "curl -L http://github.com/rails/jquery-ujs/raw/master/src/rails.js > public/javascripts/rails.js"

gsub_file 'config/application.rb', /(config.action_view.javascript_expansions.*)/,
"config.action_view.javascript_expansions[:defaults] = %w(jquery rails)"

# add time format
environment 'Time::DATE_FORMATS.merge!(:default => "%Y/%m/%d %I:%M %p", :ymd => "%Y/%m/%d")'

Expand Down

0 comments on commit 1af9ae3

Please sign in to comment.