Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 2 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Commits on Dec 18, 2011
@rodolfoliviero atualiando gem file d19b332
Commits on Jan 09, 2012
@rodolfoliviero rails 3.2.rc a2682be
Showing with 13 additions and 10 deletions.
  1. +3 −4 template.rb
  2. +9 −5 templates/Gemfile
  3. +1 −1 templates/application.html.haml
View
7 template.rb
@@ -6,7 +6,7 @@ def self.source_root
end
def clear
- run "rm README"
+ run "rm README.rdoc"
run "touch README.textile"
run "rm -rf test"
run "rm public/index.html"
@@ -31,15 +31,14 @@ def js
def gemfile
run "rm Gemfile"
copy_file "Gemfile"
- run "bundle install"
end
def devise_support
copy_file "devise.rb", "spec/support/devise.rb"
end
def guard
- copy_file "Guardfile", "."
+ copy_file "Guardfile"
end
end
@@ -57,8 +56,8 @@ def guard
Template.new.invoke_all
generate "rspec:install"
-generate "devise:install"
generate "simple_form:install"
+generate "devise:install"
git :init
View
14 templates/Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '3.1.1'
+gem 'rails', '3.2.0.rc2'
gem 'haml-rails'
gem 'jquery-rails'
@@ -12,9 +12,13 @@ gem 'mysql2'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- #gem 'sass-rails', '~> 3.1.4'
- #gem 'coffee-rails', '~> 3.1.1'
- gem 'uglifier', '>= 1.0.3'
+ #gem 'sass-rails', '~> 3.2.3'
+ #gem 'coffee-rails', '~> 3.2.0'
+ gem 'uglifier', '>= 1.0.3'
+end
+
+group :production do
+ gem 'therubyracer'
end
group :development, :test do
@@ -26,7 +30,7 @@ group :development, :test do
gem 'faker'
gem 'rails3-generators'
gem 'shoulda-matchers'
- gem "spork", "> 0.9.0.rc"
+ gem "spork", "~> 0.9.0.rc4 "
gem "guard-spork"
gem "guard-rspec"
end
View
2 templates/application.html.haml
@@ -3,7 +3,7 @@
%head
%title
%meta{'http-equiv' => 'Content-Type', :content => 'text/html', :charset => "UTF-8"}
- = stylesheet_link_tag 'application'
+ = stylesheet_link_tag 'application', :media => "all"
= csrf_meta_tag
%body
= yield

No commit comments for this range

Something went wrong with that request. Please try again.