Skip to content

Instantly share code, notes, and snippets.

@ppworks
Created January 22, 2012 05:10
Show Gist options
  • Select an option

  • Save ppworks/1655720 to your computer and use it in GitHub Desktop.

Select an option

Save ppworks/1655720 to your computer and use it in GitHub Desktop.
'rails new sample -T' diff between 3.1 and 3.2
diff sample3.1/.gitignore sample3.2/.gitignore
1,5c1,15
< .bundle
< db/*.sqlite3
< log/*.log
< tmp/
< .sass-cache/
---
> # See http://help.github.com/ignore-files/ for more about ignoring files.
> #
> # If you find yourself ignoring temporary files generated by your text editor
> # or operating system, you probably want to add a global ignore instead:
> # git config --global core.excludesfile ~/.gitignore_global
>
> # Ignore bundler config
> /.bundle
>
> # Ignore the default SQLite database.
> /db/*.sqlite3
>
> # Ignore all logfiles and tempfiles.
> /log/*.log
> /tmp
diff sample3.1/Gemfile sample3.2/Gemfile
1c1
< source 'http://rubygems.org'
---
> source 'https://rubygems.org'
3c3
< gem 'rails', '3.1.0'
---
> gem 'rails', '3.2.0'
6c6
< # gem 'rails', :git => 'git://github.com/rails/rails.git'
---
> # gem 'rails', :git => 'git://github.com/rails/rails.git'
14,16c14,20
< gem 'sass-rails', " ~> 3.1.0"
< gem 'coffee-rails', "~> 3.1.0"
< gem 'uglifier'
---
> gem 'sass-rails', '~> 3.2.3'
> gem 'coffee-rails', '~> 3.2.1'
>
> # See https://github.com/sstephenson/execjs#readme for more supported runtimes
> # gem 'therubyracer'
>
> gem 'uglifier', '>= 1.0.3'
20a25,30
> # To use ActiveModel has_secure_password
> # gem 'bcrypt-ruby', '~> 3.0.0'
>
> # To use Jbuilder templates for JSON
> # gem 'jbuilder'
>
29d38
<
diff sample3.1/Gemfile.lock sample3.2/Gemfile.lock
2c2
< remote: http://rubygems.org/
---
> remote: https://rubygems.org/
4,9c4,9
< actionmailer (3.1.0)
< actionpack (= 3.1.0)
< mail (~> 2.3.0)
< actionpack (3.1.0)
< activemodel (= 3.1.0)
< activesupport (= 3.1.0)
---
> actionmailer (3.2.0)
> actionpack (= 3.2.0)
> mail (~> 2.4.0)
> actionpack (3.2.0)
> activemodel (= 3.2.0)
> activesupport (= 3.2.0)
12,15c12,14
< i18n (~> 0.6)
< rack (~> 1.3.2)
< rack-cache (~> 1.0.3)
< rack-mount (~> 0.8.2)
---
> journey (~> 1.0.0)
> rack (~> 1.4.0)
> rack-cache (~> 1.1)
17,20c16,18
< sprockets (~> 2.0.0)
< activemodel (3.1.0)
< activesupport (= 3.1.0)
< bcrypt-ruby (~> 3.0.0)
---
> sprockets (~> 2.1.2)
> activemodel (3.2.0)
> activesupport (= 3.2.0)
22,26c20,23
< i18n (~> 0.6)
< activerecord (3.1.0)
< activemodel (= 3.1.0)
< activesupport (= 3.1.0)
< arel (~> 2.2.1)
---
> activerecord (3.2.0)
> activemodel (= 3.2.0)
> activesupport (= 3.2.0)
> arel (~> 3.0.0)
28,31c25,29
< activeresource (3.1.0)
< activemodel (= 3.1.0)
< activesupport (= 3.1.0)
< activesupport (3.1.0)
---
> activeresource (3.2.0)
> activemodel (= 3.2.0)
> activesupport (= 3.2.0)
> activesupport (3.2.0)
> i18n (~> 0.6)
33,34c31
< arel (2.2.1)
< bcrypt-ruby (3.0.1)
---
> arel (3.0.0)
36c33
< coffee-rails (3.1.1)
---
> coffee-rails (3.2.1)
38c35
< railties (~> 3.1.0)
---
> railties (~> 3.2.0.beta)
48,49c45,47
< jquery-rails (1.0.19)
< railties (~> 3.0)
---
> journey (1.0.0)
> jquery-rails (2.0.0)
> railties (>= 3.2.0.beta, < 5.0)
52c50
< mail (2.3.0)
---
> mail (2.4.1)
59,60c57,58
< rack (1.3.6)
< rack-cache (1.0.3)
---
> rack (1.4.0)
> rack-cache (1.1)
62,63d59
< rack-mount (0.8.3)
< rack (>= 1.0.0)
68,73c64,69
< rails (3.1.0)
< actionmailer (= 3.1.0)
< actionpack (= 3.1.0)
< activerecord (= 3.1.0)
< activeresource (= 3.1.0)
< activesupport (= 3.1.0)
---
> rails (3.2.0)
> actionmailer (= 3.2.0)
> actionpack (= 3.2.0)
> activerecord (= 3.2.0)
> activeresource (= 3.2.0)
> activesupport (= 3.2.0)
75,78c71,74
< railties (= 3.1.0)
< railties (3.1.0)
< actionpack (= 3.1.0)
< activesupport (= 3.1.0)
---
> railties (= 3.2.0)
> railties (3.2.0)
> actionpack (= 3.2.0)
> activesupport (= 3.2.0)
87,92c83,87
< sass-rails (3.1.5)
< actionpack (~> 3.1.0)
< railties (~> 3.1.0)
< sass (~> 3.1.10)
< tilt (~> 1.3.2)
< sprockets (2.0.3)
---
> sass-rails (3.2.3)
> railties (~> 3.2.0.beta)
> sass (>= 3.1.10)
> tilt (~> 1.3)
> sprockets (2.1.2)
111c106
< coffee-rails (~> 3.1.0)
---
> coffee-rails (~> 3.2.1)
113,114c108,109
< rails (= 3.1.0)
< sass-rails (~> 3.1.0)
---
> rails (= 3.2.0)
> sass-rails (~> 3.2.3)
116c111
< uglifier
---
> uglifier (>= 1.0.3)
Only in sample3.1: README
Only in sample3.2: README.rdoc
Common subdirectories: sample3.1/app and sample3.2/app
Common subdirectories: sample3.1/config and sample3.2/config
Common subdirectories: sample3.1/db and sample3.2/db
Common subdirectories: sample3.1/doc and sample3.2/doc
Common subdirectories: sample3.1/lib and sample3.2/lib
Common subdirectories: sample3.1/log and sample3.2/log
Common subdirectories: sample3.1/public and sample3.2/public
Common subdirectories: sample3.1/script and sample3.2/script
Common subdirectories: sample3.1/tmp and sample3.2/tmp
Common subdirectories: sample3.1/vendor and sample3.2/vendor
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment