Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: rails/rails
...
head fork: rails/rails
This comparison is big! We're only showing the most recent 250 commits
Commits on Sep 14, 2010
Rohit Arondekar rohit Application settings are specified in application.rb and not environm…
…ent.rb
7d54fba
Commits on Sep 18, 2010
Andrew White pixeltrix Remove leading slash from controller [#5651 state:resolved] 301462c
Andrew White pixeltrix Raise ArgumentError instead of normalizing controller name when there…
… is a leading slash [#5651 state:resolved]
b79a782
Commits on Sep 19, 2010
Prem Sichanugrist sikachu Use `Time.current` to maintain consistency with AS::Duration
In [32b82e4], the committer has switch
methods in AS::Duration to use `Time.current` to return the correct
duration based on the `Time.default_zone` instead of using `Time.now`.

[#5607 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
e125bf2
Thiago Pradi tchandy Exception handling more readable
[#5601 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
ab59522
Santiago Pastorino spastorino application.js should be the last file on javascript_include_tag(:all) 164e3b6
Rohit Arondekar rohit Send 'rails runner' help message to stdout instead of stderr.
[#5661 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
68034ef
Commits on Sep 20, 2010
Rohit Arondekar rohit Fix output of 'rails runner --help' [#5661 state:committed]
Backport of 76266a

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
39cb27b
Thiago Pradi tchandy Updating error message on ruby_version_check.rb
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
9d36e2a
Commits on Sep 21, 2010
Aaron Patterson tenderlove providing arel with column information when possible [#5392 state:res…
…olved]
a0fc2f7
Aaron Patterson tenderlove fixing tests. woo bfd4022
Aaron Patterson tenderlove removing lolinject 7a6c715
Commits on Sep 22, 2010
Hemant Kumar remove join table rows before removing owner row for habtm associatio…
…ns, fixes#5674
8765e06
Neeraj Singh neerajdotname Error message should advice to use 'mysql2' gem.
If I create a new app using command
rails new demo -d mysql
then Gemfile contains 'mysql2' gem by default.

However if mysql gem is missing then error message says
raise "!!! Missing the mysql gem. Add it to your Gemfile: gem 'mysql', '2.8.1'"

[#5569 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
3c36c12
Santiago Pastorino spastorino Missing the mysql2 gem here 2db3035
Commits on Sep 23, 2010
Carl Lerche carllerche Improve performance of applications using file uploads by not busting…
… the method cache on every request containing a file upload.
684bb86
Commits on Sep 24, 2010
Fred Wu fredwu Ensures the app generator generates the correct @app_name. [#5434 sta…
…te:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
b0f0591
Aaron Patterson tenderlove fixing bug with rails use of rack-test 1a61a79
Rodrigo Rosenfeld Rosas rosenfeld Properly interpolate i18n keys in modules [#5572 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
8d14fa8
tnp tnp restore behavior of touch for models without :updated_xx [#5439 state…
…:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
bdba748
Jeff Kreeftmeijer jeffkreeftmeijer got rid of the "ambiguous first argument; put parentheses or even spa…
…ces" warnings in the scaffold_generator tests [#4872 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
109c37b
Emilio Tagua miloops Goodbye inject, hello map.
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
68e1b5a
Emilio Tagua miloops No need to use inject here, use map instead.
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
093a30a
Emilio Tagua miloops Perf: refactor method.
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
27cfb3e
Emilio Tagua miloops No need to use inject here.
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
e1e39a9
Emilio Tagua miloops Refactor association_collection uniq method.
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
abb99e3
Emilio Tagua miloops Refactor methods in html node to avoid injects.
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
8105bc0
Emilio Tagua miloops Perf: refactor _assign method to avoid inject and defining unneeded l…
…ocal var.

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
e66c1ce
Emilio Tagua miloops Refactor decode_credentials to avoid inject and use map instead.
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
49d54b4
Emilio Tagua miloops Fix typo and add sanity test for code statistics rake task.
Signed-off-by: José Valim <jose.valim@gmail.com>
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
8a68862
Emilio Tagua miloops These tests shouldn't depend on local time to pass or fail, we can us…
…e utc here.

Signed-off-by: José Valim <jose.valim@gmail.com>
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
e41add0
Brian Candler candlerb Fix warning message when db/schema.rb doesn't exist [#5625 state:reso…
…lved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
4d023a6
marklazz marklazz Delegate ActiveRecord::Base.offset to scoped methods (analogous to li…
…mit) [#5688 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
23f728a
Andrew Kaspick akaspick memoized protected methods should remain protected
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
0387d5b
Commits on Sep 26, 2010
Santiago Pastorino spastorino Bump up some deps c8b34f2
Santiago Pastorino spastorino Bump up more deps c8bf967
Santiago Pastorino spastorino port is appended twice to HTTP_HOST when host already has the port 268319c
Santiago Pastorino spastorino Not need to do this double ternary 262319a
Santiago Pastorino spastorino Fix the precedence issue here 19b7123
Tim Connor Fix remove_index issue when provided :name is a symbol
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
15fd9a2
Nic Benders benders db:structure:dump should list current Rails.env adapter in errors, no…
…t always the test adapter

[#5710 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
59ef0a2
Commits on Sep 27, 2010
Aaron Patterson tenderlove do not pass nil values to arel f90a298
Tim Connor Raise errors when index creation fails
Signed-off-by: José Valim <jose.valim@gmail.com>
2f618bf
Tim Connor Fix issue with remove_index and add unit test [#5645 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
d3ffea2
Aaron Patterson tenderlove depend on the arel gem, not the arel git repo d5e9165
Aaron Patterson tenderlove removing nonsensical tests, limit now actually adds a limit a88af8a
Aaron Patterson tenderlove Revert "depend on the arel gem, not the arel git repo"
This reverts commit d5e9165.
f38c46c
Aaron Patterson tenderlove depending on arel 2.0.0 e677275
Diego Carrion dcrec1 renderer calls object.to_json when rendering :json => object [#5655 s…
…tate:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
a56df5b
Neeraj Singh neerajdotname after_create in ActiveModel should in the order specified
[#5650 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
9e32b1c
Aaron Patterson tenderlove make sure we use the engine assigned to the table when quoting b32bd08
Xavier Noria fxn let Hash#to_param and Hash#to_query sort again
This was a regression introduced in 5c85822. We bring
sorting back because people rely on it, eg for constructing consistent cache keys.
6643929
Xavier Noria fxn revises RDoc of Hash#to_param to be more precise about ordering 61e70bf
Commits on Sep 28, 2010
Neeraj Singh neerajdotname backport of #5705 to 3-0-stable
[#5705 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
e0411f3
Neeraj Singh neerajdotname backport of #5706 and #5579 to 3-0-stable
[#5706 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
2525bfc
Aaron Patterson tenderlove porting 515917f to master c2c6f12
Aaron Patterson tenderlove porting 0665182 to master. Thanks Marcelo Giorgi 9edaf10
Étienne Barrié etiennebarrie Test add_index and remove_index with a symbol name #4891 fae57ef
marklazz marklazz Set attributes properly for model built from association with conditi…
…ons [#5562 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
9e5545c
Commits on Sep 29, 2010
Aaron Patterson tenderlove where_values_hash always returns a hash 40bc0cb
Aaron Patterson tenderlove reduce method calls in the dynamic finder matcher 10d9740
Aaron Patterson tenderlove DRY up our regular expression 1efeb5c
Aaron Patterson tenderlove do not need intermediate variable, avoid lasgn cab1207
Aaron Patterson tenderlove no need for a case / when statement 1e687e9
Aaron Patterson tenderlove @klass also uses DynamicFinderMatch, so no need for it on the relation 409bd22
Aaron Patterson tenderlove constructor should not do so much work; avoid allocating object if po…
…ssible
ecbfed2
Aaron Patterson tenderlove adding test cases for the dynamic finder matcher match method e6e9083
Aaron Patterson tenderlove be kind to the garbage collector: only instantiate objects when absol…
…utely necessary
721f434
Aaron Patterson tenderlove use new skool Ruby instead of Ruby Classic™ 6059c96
Aaron Patterson tenderlove removing an inject + merge in favor of Hash#[] c493624
Aaron Patterson tenderlove avoid calling to_sql when we can 93096ae
Aaron Patterson tenderlove no need for splat and flatten bf388f3
Aaron Patterson tenderlove each works well too ede0466
Aaron Patterson tenderlove convert inject to map + join 1685bd2
Aaron Patterson tenderlove fisting the postgresql tests 3daf822
Aaron Patterson tenderlove removing a conditional that is not used 439a0ce
Aaron Patterson tenderlove refactoring to remove crazy logic 2e01141
Aaron Patterson tenderlove removing unused lasgns a01547c
Aaron Patterson tenderlove dry up calls to arel.join() ddc2f2e
Aaron Patterson tenderlove we only care about arrays and strings 8ae8125
Aaron Patterson tenderlove shorten up or sql literal creation statements e080144
Aaron Patterson tenderlove SqlLiteral is a string, so we can dry up these conditionals a35c8c6
Aaron Patterson tenderlove removing more useless code! yay! f640af5
Santiago Pastorino spastorino Add gem 'arel' from git commented out as an example of how to Bundle …
…egde Rails with Arel edge

[#5723 state:committed]
9ddda10
José Valim josevalim Ensure that named routes do not overwrite previously defined routes. 1a2b28c
Commits on Sep 30, 2010
José Valim josevalim Use .find here as it is simpler and faster. 5704aa2
yalab yalab Fix 'rake db:create' is ignore encoding when using postgres [#5717 st…
…ate:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
b081758
Oleg Dashevskii be9 Tests proving #5441 43f404e
Aaron Patterson tenderlove group clause must be more specific de3c0d7
Aaron Patterson tenderlove [#5441 state:resolved] refactoring code to determine aggregate column fc1bd2b
marklazz marklazz AssociationCollection#include? working properly for objects added wit…
…h build method [#3472 state:resolved]
2221b70
Aaron Patterson tenderlove speeding up object instantiation by eliminating instance_eval ea63054
Aaron Patterson tenderlove type_name is never a blank string, so use faster .nil? call 7e73344
Aaron Patterson tenderlove build_where should be private b0b2d41
Aaron Patterson tenderlove type_name should check for blank because people may have messed up da…
…tabases
fc1c799
Aaron Patterson tenderlove Arel::Sql::Engine.new does not do anything anymore 87104a7
Commits on Oct 02, 2010
José Valim josevalim Revert "Perf: refactor _assign method to avoid inject and defining un…
…needed local var."

_assigns must return a hash.

This reverts commit e66c1ce.
f9b5f63
Aditya Sanghi asanghi Fixing search_field to remove object attribute from options hash [#5730
… state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
3569bde
Aditya Sanghi asanghi added test for form_for with search_field
Signed-off-by: José Valim <jose.valim@gmail.com>
f283812
José Valim josevalim Deprecate config.generators in Rails::Engine in favor of config.app_g…
…enerators.

config.generators still works fine in Rails::Application and Rails::Railtie, but it will be deprecated in the latter in Rails 3.1.
fef4273
José Valim josevalim :'' is not valid ruby. ebfbb2a
Commits on Oct 03, 2010
David Chelimsky dchelimsky Added test case to specify that _assigns returns a Hash in AV::TC
[#5751 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
2380c71
Santiago Pastorino spastorino PERF: Hash[] + map is faster than this inject, and var[1..-1] is fast…
…er than var.sub('@', '')
e99c894
Commits on Oct 04, 2010
Santiago Pastorino spastorino _assigns can have more internal vars in this test e5da873
David Chelimsky dchelimsky Add view_assigns and deprecate _assigns for AV::TC on 3-0-stable
branch.

Signed-off-by: José Valim <jose.valim@gmail.com>
86571a1
Aaron Patterson tenderlove [#5406 state:resolved] calling the correct method on minitest to obta…
…in the test name
4a77431
Aaron Patterson tenderlove calling correct method on minitest for test name when teardown callba…
…ck fails
c13aaaa
Commits on Oct 05, 2010
Xavier Noria fxn new guide: Ruby on Rails Guides Guidelines da927d2
Xavier Noria fxn aaaaannnddd, your beloved typo only spotted in the github colored dif…
…f no matter how many passes you did before pushing
cec7129
Xavier Noria fxn a couple of touches to the guides guidelines 13a4d14
Commits on Oct 06, 2010
Erik Michaels-Ober sferik Fix copy/paste bug
Signed-off-by: José Valim <jose.valim@gmail.com>
3e958a5
Aditya Sanghi asanghi mailer comment should use namespace in comment accc567
Aditya Sanghi asanghi adding test for namedspaced mailers af53ed8
Hemant Kumar fix ruby 1.9 deadlock problem, fixes #5736 add connection pool tests 444aa9c
Commits on Oct 07, 2010
Ryan Bigg radar Add "a" to make it better English
[#3796 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
53def60
Anil Wadghule anildigital Add jruby-openssl gem in Gemfile necessary for JRuby
[#5762 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
b9fd742
Santiago Pastorino spastorino Add a TODO to remove gem "jruby-openssl" when jruby-openssl is merge …
…in jruby

[#5762]
9eeb24c
Aaron Patterson tenderlove adding tests for uploaded file 1e50fae
Aaron Patterson tenderlove delegate to the @tempfile instance variable c4528de
Aaron Patterson tenderlove if it walks like a duck and talks like a duck, it must be a duck 003d67e
Aaron Patterson tenderlove raising an argument error if tempfile is not provided d752447
Aaron Patterson tenderlove making sure respond_to? works properly fc9e9ed
Aaron Patterson tenderlove only forwarding enough methods to work. People should grab the delega…
…te tempfile if they really need to do hard work
5e685ca
James MacAulay jamesmacaulay fix rendering a partial with an array as its :object [#5746 state:res…
…olved]

Signed-off-by: Michael Koziarski <michael@koziarski.com>
2ded862
Commits on Oct 08, 2010
Andrew White pixeltrix Backport ca3936d to 3-0-stable [#5274] 981942a
Andrew White pixeltrix Refactor resource action scope methods d066ad6
Commits on Oct 09, 2010
Santiago Pastorino spastorino Merge rails routing guide from master 0b9eced
Commits on Oct 10, 2010
Yehuda Katz wycats Fix a few bugs when trying to use Head standalone b4b4a2a
Andrea Campi andreacampi Override #store to be consistent with #[].
[#5775 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
61fc0f0
Greg Hurrell wincent Fix misleading advice to add 'memcache' to Gemfile
[#5539 state:committed]

Commit 5714438 removed the hard-coded dependency on the memcache-client
gem, and added this warning advising people to install it if needed. The
problem is, however, that if people follow the advice literally and install
the 'memcache' gem, they will wind up with a completely different thing,
which is not API compatible with the memcache-client gem and which Rails
can't work with.

So, be explicit and tell users to install the 'memcache-client' gem.

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
3a6acb6
Barry Sears bsears Make ActiveSupport load own version.
[#5739 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
4245dcd
Yehuda Katz wycats Always pull in version for frameworks (standardize autoload / require…
… / none)
83d5180
Yehuda Katz wycats Cherry pick didn't get this deletion b4954e8
Santiago Pastorino spastorino Revert "Make InstanceTagMethods#value_before_type_cast raise if the m…
…odel don't respond to attr_before_type_cast or attr method"

And    "Makes form_helper use overriden model accessors"

This reverts commit 3ba8e31 and fb0bd8c.
3021297
Commits on Oct 11, 2010
Santiago Pastorino spastorino Add except as AR public API d0d1aca
Santiago Pastorino spastorino Deprecate reorder in favor of except(:order).order(...) 0b46f72
Santiago Pastorino spastorino CHANGELOG of reorder deprecation 448a187
Santiago Pastorino spastorino data-disable-with in button_to helper
[#4993 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
0c56a27
marklazz marklazz Honor distinct option when used with count operation after group clau…
…se [#5721 state:resolved]
dba7de0
Aaron Patterson tenderlove we should always cast the value based on the column 0a8eaff
Szymon Nowak szimek Return a valid empty JSON on successful PUT and DELETE requests. [#5199
… state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
1556e08
Commits on Oct 12, 2010
Xavier Noria fxn getting started guide: deletes orphan <% end %>, reported by Michael …
…L. Miller
869118a
Aaron Patterson tenderlove stop using deprecated arel API 85ffbfe
Commits on Oct 14, 2010
Santiago Pastorino spastorino Don't use Arel from git anymore 10d3ab7
Santiago Pastorino spastorino Leave env :AREL only for testing purposes f7faa86
Michael Koziarski NZKoz Revert 0c0b0aa which introduced a security vulnerability.
This addresses  CVE-2010-3933

Conflicts:

	activerecord/lib/active_record/nested_attributes.rb
37431bb
Commits on Oct 16, 2010
Santiago Pastorino spastorino Bump bundler up to 1.0.3 0891f49
Commits on Oct 18, 2010
Andrew White pixeltrix Reset assert_template instance variables between requests [#5832 stat…
…e:resolved]
141cba8
Santiago Pastorino spastorino Merge 3.0.1 CHANGELOGs and prepare 3.0.2.pre 14b33a4
Santiago Pastorino spastorino compact is unneeded here adea146
Commits on Oct 20, 2010
Aaron Patterson tenderlove bumping mysql2 requirement 4480521
Jan Xie janx default scope merge where clauses [#5488 state:resolved] f294540
Commits on Oct 21, 2010
Santiago Pastorino spastorino Revert "Bump bundler up to 1.0.3"
This reverts commit 0891f49.
c53f301
Commits on Oct 23, 2010
Xavier Noria fxn switches guides code syntax highlighting to the better SyntaxHighligh…
…ter, I did my best with the theme, I swear
5a4a232
Commits on Oct 24, 2010
Xavier Noria fxn removes the toolbar from guides code blocks 1a618e9
Xavier Noria fxn use a gray a little darker in code blocks, for better contrast with t…
…he gray background
7ca9dcd
Xavier Noria fxn configure a uniform font-family for code in guides ec23bc1
Xavier Noria fxn ensures that no browser shows a vertical scrollbar in the code blocks…
… of guides, thanks to Marcelino Llano for a hint to fix this
e9d593b
Commits on Oct 25, 2010
Andrew White pixeltrix Don't write out secure cookies unless the request is secure 909c860
Commits on Oct 26, 2010
Mikel Lindsaar mikel Updating mail dependency to 2.2.9 5f6a02f
Andrew White pixeltrix Allow generated url helpers to be overriden [#5243 state:resolved] 63b0d0e
Commits on Oct 27, 2010
Andrew White pixeltrix Ensure that Rails.env is defined first 0d23c21
Aaron Patterson tenderlove reducing the number of parameters to select() f73a3e6
Commits on Oct 29, 2010
Andrew White pixeltrix Backport of documentation fixes: ddf7360
Commits on Oct 30, 2010
Ernie Miller ernie Fix issues when including the same association multiple times and mix…
…ing joins/includes together.
c681df4
Aaron Patterson tenderlove dup rather than create so many arrays 4fd9c20
Aaron Patterson tenderlove swap out some n^2 for some n 4772abc
Aaron Patterson tenderlove reduce duplicate where removal to one loop 4d2a53d
Aaron Patterson tenderlove no need to merge where values if no new where values have been added ae7a354
Aaron Patterson tenderlove adding tests for #5234 and #5184. Tests were from Akira Matsuda. Than…
…ks Akira!
3bc12d3
Aaron Patterson tenderlove only returning where values for the corresponding relation, also filt…
…ering where value hash based on table name [#5234 state:resolved] [#5184 state:resolved]
29b3af5
Uģis Ozols ugisozols Changed environment.rb to application.rb c95f155
Rob Zolkos robzolkos added tip about ruby-debug needing a different gem if using 1.9 [#190
…state:resolved]
b5efa8f
Uģis Ozols ugisozols Reworded sentence using text from rails source code. eca3791
Uģis Ozols ugisozols Changed environment.rb to application.rb 3ca1bc3
Commits on Oct 31, 2010
Jon Leighton jonleighton Fix bug with 0bb85ed which missed out a fixtures declaration in casca…
…ded_eager_loading_test.rb
918bf84
Commits on Nov 02, 2010
Andrew White pixeltrix Add additional HTTP request methods from the following RFCs:
* Hypertext Transfer Protocol -- HTTP/1.1
  http://www.ietf.org/rfc/rfc2616.txt)

* HTTP Extensions for Distributed Authoring -- WEBDAV
  http://www.ietf.org/rfc/rfc2518.txt

* Versioning Extensions to WebDAV
  http://www.ietf.org/rfc/rfc3253.txt

* Ordered Collections Protocol (WebDAV)
  http://www.ietf.org/rfc/rfc3648.txt

* Web Distributed Authoring and Versioning (WebDAV) Access Control Protocol
  http://www.ietf.org/rfc/rfc3744.txt

* Web Distributed Authoring and Versioning (WebDAV) SEARCH
  http://www.ietf.org/rfc/rfc5323.txt

* PATCH Method for HTTP
  http://www.ietf.org/rfc/rfc5789.txt

[#2809 state:resolved] [#5895 state:resolved]
6c8982f
Jeff Kreeftmeijer jeffkreeftmeijer Make sure capture's output gets html_escaped [#5545 state:resolved]
Also remove a duplicate test_link_to_unless assertion and add .html_safe
to the remaining one.

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
5cb1dad
Santiago Pastorino spastorino Call as ERB::Util.html_escape since is not the module is not included…
… here
2c8bff3
Santiago Pastorino spastorino Test that capture doesn't escape twice a682986
Don Wilson dontangg Added :negative_format option to number_to_currency function [#5894 s…
…tate:resolved]

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
b913717
Commits on Nov 03, 2010
Xavier Noria fxn made a pass to the docs of :negative_format a56142c
Commits on Nov 04, 2010
José Valim josevalim Update to latest thor with https bug fix. e6abfc4
sblackstone Association Proxy should not undefine the default respond_to_missing 7ab940c
Commits on Nov 07, 2010
Chris Eppstein chriseppstein Correctly handle the case of an API response that returns a hash by t…
…reating a single hash argument as the resource instead of as options.

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
d4b7fa5
Michael Koziarski NZKoz Added support for Erubis <%== tag
<%== x %> is syntactic sugar for <%= raw(x) %>

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#5918 status:committed]

Conflicts:

	actionpack/test/controller/new_base/render_template_test.rb
ea1fde6
Michael Koziarski NZKoz Make safe_append= live on AV::OutputBuffer not AS::SafeBuffer f676beb
Denis Odorcic odorcicd Fix FileStore cache incorrectly regenerating its key from a pathname …
…when a regexp is used in expire_fragment

[#5850 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
ad2c0bd
Santiago Pastorino spastorino Test cache.key_file_path with separators ht. Jim Wilson [#5611] c7fac8c
Commits on Nov 09, 2010
Andrew White pixeltrix Strip regexp anchors from rake routes output [#5934 state:resolved] 4b33bd9
David Chelimsky dchelimsky use persisted? instead of new_record? wherever possible
- persisted? is the API defined in ActiveModel
- makes it easier for extension libraries to conform to ActiveModel
  APIs
  without concern for whether the extended object is specifically
  ActiveRecord

[#5927 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
f1c13b0
Santiago Pastorino spastorino Execute less operations 844b9a5
Santiago Pastorino spastorino Don't check if persisted is defined just initialize it properly b0f6349
Santiago Pastorino spastorino Double negation of an already boolean value produces the same result bf875b2
Xavier Noria fxn registers number_to_currency's :negative_format in the CHANGELOG of AP 7611a09
Commits on Nov 11, 2010
Álvaro Bautista Pino alvarobp Fix ActiveSupport::TimeWithZone#localtime method with DateTime
[#5344 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
387a1a6
Santiago Pastorino spastorino Duck typing here 2e4e1ed
Aditya Sanghi asanghi patching to ensure separator is printed with order [#5816 state:resol…
…ved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
1b66a64
Carlos Antonio da Silva carlosantoniodasilva Bring ActionPack tests back to life
Signed-off-by: José Valim <jose.valim@gmail.com>
55a8bd6
Carlos Antonio da Silva carlosantoniodasilva Fix issue with rendering partials and then yielding inside a render l…
…ayout call

The given block was never being executed when another render :partial call
existed before the yield call, due to the block being overriden.

This commit also adds some more tests to render with :layout option.

Signed-off-by: José Valim <jose.valim@gmail.com>
3e86e4b
Carlos Antonio da Silva carlosantoniodasilva Fix render partial with layout and no block
When using a render :partial with :layout call, without giving a block,
if the given :partial had another render :partial call, the layout was
not being rendered. This commit fixes this context by storing variables
before rendering the partial, so they are not overrided in any successive
call to render partials down the path. All ActionPack tests are ok.

Signed-off-by: José Valim <jose.valim@gmail.com>
d5fd83f
marklazz marklazz Make after_filter halt when before_filter renders or redirects [#5648
…state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
0de95df
Neeraj Singh neerajdotname fields_for should treat ActiveRecord::Relation as an array
[#5795 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
86f66e9
Jeff Kreeftmeijer jeffkreeftmeijer The model generator shouldn't throw warnings when using mass nouns [#…
…5363 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
be63e03
Santiago Pastorino spastorino Bump Arel up to 2.0.2 30ae44a
Nathan Broadbent ndbroadbent Fixed bug in active_record/nested_attributes where an empty string id…
… caused an ActiveRecord::RecordNotFound error. Found by [Ben Tillman]

[#5638 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
d54ab37
Santiago Pastorino spastorino Use ! instead of not ed62b96
Commits on Nov 13, 2010
Santiago Pastorino spastorino Make collection and collection_from_object methods return an array
This transforms for instance scoped objects into arrays and avoid
unneeded queries

[#5958 state:committed]
b870193
Carlos Antonio da Silva carlosantoniodasilva Fix rendering partial with layout, when the partial contains another …
…render layout with block call

In such situations, the first layout was not being applied. This fixes it by
storing the block variable before rendering the partial, so the variable
is not overrided, thus the layout is applied (bear in mind the renderer is
shared among all render calls).

This commit also adds some more tests to render partials with layouts and
nested render layout calls.

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
bdec56c
Carlos Antonio da Silva carlosantoniodasilva Remove lost commented debugger call
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
4266e3e
Commits on Nov 14, 2010
Jason Cheow jasoncheow Fix bug where size of through association is not correct after adding…
… a has_many association (occurs only before main object has been reloaded).

[#5968 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
f8b7c74
Santiago Pastorino spastorino Remove unused var 01ed700
Commits on Nov 15, 2010
Mikel Lindsaar mikel Bump up mail dependency to take advantage of relaxed i18n version req…
…uirement
fc95196
Mikel Lindsaar mikel Revert "Bump up mail dependency to take advantage of relaxed i18n ver…
…sion requirement"

Locking to ~> 2.2.9.1 means locking to < 2.2.10, not intended behaviour.

This reverts commit e7de5dd.
10fc93b
Ryan Bigg radar Add further documentation + examples for the get, post, put and delet…
…e methods in ActionDispatch::Routing::Mapper::HttpHelpers
9ccaf47
Ryan Bigg radar Separate comments and examples with "Examples" header. 9078041
Ryan Bigg radar Document the :module and :path options for the scope method. 3551e25
Ryan Bigg radar Document the defaults method afc16f6
Ryan Bigg radar Document the controller method for AD's Mapper 467d584
Ryan Bigg radar Begin to document the namespace method for AD's Mapper 1287fdd
Ryan Bigg radar Document the :path option for namespace e777b91
Ryan Bigg radar Document the :module option for namespace 4228318
Ryan Bigg radar Document the :as option for the namespace method 4552571
Ryan Bigg radar Fix indentation on comment for :path option 3401529
Ryan Bigg radar Space between module option documentation and path documentation 0db8412
Ryan Bigg radar Document the :as option for the scope method 06402b0
Ryan Bigg radar Indent code example for :as option 7a1f22f
Ryan Bigg radar Indent final comment for :path option 020f74b
Ryan Bigg radar Document the :shallow_path option for scope 4ffd31e
Ryan Bigg radar Fix indentation for :as option documentation on the namespace method 205b240
Francesc Esplugas Fixes ActionMailer example error 45c3aba
Rajinder Yadav ryadav corrected to Rails 3 syntax for declaring resources bad920f
Rajinder Yadav ryadav removed etc. not require 41e5e4a
Damien Mathieu dmathieu Use Rails.logger, not ActiveRecord::Base.logger
Because everybody is not using ActiveRecord. And the logger is not specific to it.
70e4403
Rajinder Yadav ryadav removed indentation, for code style consistency and readibility 5d9219b
José Valim josevalim Add a note to TextHelpers making explicit their default behavior of n…
…ot escaping but sanitizing.
4c3edae
Frederick Ros sleeper Fixed the name of the 'generator option' 13f10ac
Ryan Bigg radar Add documentation for the mount method in ActionDispatch's Mapper 86534a3
Ryan Bigg radar See the scope method for documentation for namespace's shallow_path o…
…ption
43b0fd7
Ryan Bigg radar Add documentation for :path_names option on resources ccc8d9c
Paco Guzmán pacoguzman colorize_logging is a Rails General Configuration option not a specif…
…ic option of ActiveRecord
dbc0023
Ryan Bigg radar Document the constraints method 28f9d60
Rajinder Yadav ryadav the partial option is not required for simple partial rendering 7487767
Rajinder Yadav ryadav corrected sample code to clear @_current_user class variable also c41d981
Rajinder Yadav ryadav added note with example for using flash in redirection 4369f13
Rajinder Yadav ryadav removed unnecessary indentation 1540bf5
Jaime Iniesta jaimeiniesta Getting Started guide: remove calls to f.error_messages as it has bee…
…n removed from Rails
65fdd28
James Miller bensie Add HTTP Verb Constraints (:via) to routing guide 029c8ff
David Heinemeier Hansson dhh Prep for 3.0.2 release 31b6a6a
David Heinemeier Hansson dhh Prep for relese 186e3c7