Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

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

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rails/rails
...
head fork: rails/rails
Commits on Apr 10, 2010
@wycats wycats Not using class_eval wasn't adding clarity here 76e0a9e
Commits on Apr 11, 2010
@mikel mikel Removing quoting and adding Mail 2.3.5 8f22be0
@mikel mikel Removing quoting.rb, upgrade to 2.1.3.6, changing all utf-8 reference…
…s to UTF-8, updating tests where incorrect encoding
dbcf01e
@mikel mikel Fixing up some bad test cases 6c6bef2
@mikel mikel Added explict setting of charset in set_fields! method to make sure M…
…ail has the user defined default
e157a3d
@mikel mikel Mail::Part now no longer has nil as a default charset, it is always s…
…et to something, and defaults to UTF-8
03dd8f7
@mikel mikel Don't need no quoting test, done in mail a9e918f
@mikel mikel Moved test of QP into mail fd9ee49
@mikel mikel Cleaning up expectations from the new way mail does it bd89c39
@mikel mikel New mail is more intelligent on encoding and decoding 2a793fa
@mikel mikel Updating actionmailer to Mail version 2.2.0 fc5d817
@mikel mikel Updating changelog for Mail 2.2.0 dd02090
@fxn fxn second pass to the intro rdoc of form_helper.rb 9111f42
@fxn fxn your beloved typo only spotted in github diff no matter how careful y…
…ou were before pushing
fb4b454
@spastorino spastorino Make namespace work with options[:to] [#4351 state:committed]
Signed-off-by: José Valim <jose.valim@gmail.com>
5b89fd0
@josevalim josevalim Merge branch 'master' of gitproxy:rails/rails 1f80b8b
@wycats wycats Merge branch 'master' of github.com:rails/rails 803df08
@tenderlove tenderlove mode postgresql adapters table_exists? method take the schema in to a…
…ccount. [#4341 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
ecf039f
Commits on Apr 12, 2010
@wycats wycats Merge remote branch 'mikel/master' 59c6082
@ryanb ryanb fields_for returns block result when outside ERB
Signed-off-by: wycats <wycats@gmail.com>
e5f392c
@josevalim josevalim Move set_fields! to the old API module. b5f9a9f
@josevalim josevalim Fix ActionMailer test broken in 99d5459 3fc609e
@josevalim josevalim Let capture handle the yielding. 3eda7cf
@anildigital anildigital Make RUBY_PLATFORM windows regex consistent [#4345 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
b9b9f9e
@pixeltrix pixeltrix Generate module file for namespaced models [#4230 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
788d923
@phs phs table_name_prefix and table_name_suffix are class_attributes instead …
…of cattr_accessors. [#4230]

Signed-off-by: José Valim <jose.valim@gmail.com>
bab1f91
@joevandyk joevandyk Avoid unnecessary allocations in Inflector.underscore [#3626 state:re…
…solved]

Signed-off-by: José Valim <jose.valim@gmail.com>
ccf3366
@josevalim josevalim Ensure match path, :controller => name works as expected. a8b1ca2
@spastorino spastorino Make dev and edge app generation options generate edge arel on Gemfile
Signed-off-by: José Valim <jose.valim@gmail.com>
25cb213
@josevalim josevalim Fix a bug in url generation for generic routes. 86defed
@indirect indirect Update the Bundler snippet for 0.9.15 and above ca37865
@spastorino spastorino Fix namespaced_controllers_with_namespaced_routes test
Signed-off-by: José Valim <jose.valim@gmail.com>
3c456a8
Commits on Apr 13, 2010
@felipero felipero moved rails binary to rails gem, so rubygems can find specific versio…
…ns of rails [#4382 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
a64bfc3
@anildigital anildigital Replace deprecated RAILS_ROOT to Rails.env [#4373 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
219c81b
Emmanuel Oga make ActiveRecord::Base.subclasses a public method
Signed-off-by: wycats <wycats@gmail.com>
f8eddcc
stlruby@googlegroups.com Remove RAILS_ROOT from webrick_server docs.
Signed-off-by: wycats <wycats@gmail.com>
ee04aea
@pixeltrix pixeltrix Refactor compute_type to handle situations where the correct class is…
… already loaded

Signed-off-by: wycats <wycats@gmail.com>
9cea9bc
@craigw craigw Fix a typo in the documentation. [#4318 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
54533d2
@wycats wycats Add a test that used to fail but is fixed now [#3417 state:resolved] 36f3634
@norman norman Improve reliability of Inflector.transliterate. [#4374 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
dceef08
@spastorino spastorino Added missing require and delete unused one on proc.rb 7fa6c16
@jeremy jeremy Fix regexp typo 4d09832
@dhh dhh Update changelogs for release 4c8af9b
@dhh dhh Simple release script 5c89727
@dhh dhh Cleanup indention and spacing and turn errorExplanation into error_ex…
…planation now that nobody depends on it anymore
8116a2b
@anildigital anildigital Use correct RUBY_PLATFORM regex for Windows env [#4385 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
518891f
@Rakoth Rakoth Add test case which check content type when rendering rjs partial in …
…html template

Signed-off-by: wycats <wycats@gmail.com>
dc25138
@josevalim josevalim template_name and template_path should not be added to mail headers. b4fd5e6
@wycats wycats Merge branch 'master' of github.com:rails/rails 8e9df34