Commit Graph

27200 Commits

Author SHA1 Message Date
Vijay Dev
263d8424b3 update changelogs for gems without changes too [ci skip] 2012-03-09 03:17:15 +05:30
Vijay Dev
3bfd6516c3 changelog updates [ci skip] 2012-03-09 02:07:42 +05:30
Vijay Dev
c1a01c795d In a nested resource route, the parent resource param is <resource_name>_id
This fix was made by @coreyhaines on docrails and merged in master.
Cleanly cherry picking into 3-2-stable wasn't possible.
2012-03-09 00:27:57 +05:30
coreyhaines
df755d4e53 Left off a : when specifying the :namespace option for a :controller
path segment
2012-03-09 00:26:32 +05:30
Caius Durling
22a8433631 Fix typo in isolated engine docs 2012-03-09 00:21:57 +05:30
Matthew Conway
061f8ae436 Fix typo in asset pipeline guide 2012-03-09 00:21:57 +05:30
Braden Schaeffer
357e288f44 Fix doc examples for has_and_belongs_to_many association 2012-03-09 00:21:57 +05:30
Swanand Pagnis
30feb8c816 Fixed a slightly misleading equivalent SQL code on the 3.2 query interface. 2012-03-09 00:21:56 +05:30
Mikhail Dieterle
1f2224da77 typo 2012-03-09 00:21:53 +05:30
Carlos Antonio da Silva
e63f04cc0c Improve docs for attr_accessible|protected related to Hash#except|slice 2012-03-09 00:21:45 +05:30
kuahyeow
9bcd6622dd Add tests to test that through associations are not readonly, and we can update the records we retrive from the association 2012-03-08 09:49:21 +13:00
José Valim
524e8a1a80 Merge pull request #5316 from Jacobkg/master
Update ActiveRecord::AttributeMethods#attribute_present? to return false for empty strings
2012-03-07 16:08:26 +01:00
José Valim
3775058f1f Remove usage of deprecated module. 2012-03-07 15:26:56 +01:00
Carlos Antonio da Silva
b35fd40891 Add test case for #5307 2012-03-07 15:03:19 +01:00
José Valim
e7560bc787 Set the rendered_format on respond_to. 2012-03-07 15:03:08 +01:00
José Valim
bcea8cd6d6 Just change the formats on first render, closes #5307, closes #5308. 2012-03-07 14:55:20 +01:00
Santiago Pastorino
74fe7e1018 Deprecate ActionController::SessionManagement 2012-03-06 18:13:30 -02:00
José Valim
9c56401c0e Use latest rack-cache. 2012-03-06 10:13:44 +01:00
Mikel Lindsaar
0d2798eda5 Increasing minimum version of mail due to security vulnerability found in Mail 2.4.1 for sendmail or exim 2012-03-06 19:58:48 +11:00
José Valim
688e4f0fd1 Merge pull request #5299 from sikachu/3-2-stable-fix-responder
Always passing a respond block from to responder
2012-03-06 00:50:00 -08:00
Prem Sichanugrist
82a8698e56 Always passing a respond block from to responder
We should let the responder to decide what to do with the given
overridden response block, and not short circuit it.

Fixes #5280
2012-03-05 21:09:47 -05:00
Mario Visic
5b73a3a5ca Failing test for mime responder respond_with using a block. 2012-03-05 21:09:36 -05:00
Jean Boussier
e1a882a15b Fix #5069 - Protect foreign key from mass assignment throught association builder 2012-03-05 10:33:47 -08:00
Michael Koziarski
ebc5a19ba2 Merge pull request #5278 from rafaelfranca/fix-build-3-2
[3-2-stable] Fix build
2012-03-04 18:04:47 -08:00
Rafael Mendonça França
2a6b7e5a0c Now all the models need to explicitly declare the accessible attributes 2012-03-04 22:37:16 -03:00
Rafael Mendonça França
f604a6368b Only add the whitelist_attributes option if ActiveRecord is present
Conflicts:

	railties/test/generators/app_generator_test.rb
	railties/test/isolation/abstract_unit.rb
2012-03-04 22:37:04 -03:00
Michael Koziarski
06a3a8a458 Whitelist all attribute assignment by default.
Change the default for newly generated applications to whitelist all attribute assignment.  Also update the generated model classes so users are reminded of the importance of attr_accessible.
2012-03-05 11:12:01 +13:00
Carlos Antonio da Silva
864d755177 Only run binary type cast test with encode! on Ruby 1.9 2012-03-04 16:35:35 +01:00
Lars Kanis
f6d478adcd fix associations when using per class databases
would get ConnectionNotEstablished error because it always tried to use
ActiveRecord::Base's connection, even though it should be using the connection
of the model whose context we're operating in
2012-03-04 16:16:07 +01:00
Vijay Dev
23ca13a877 CSS fix for guides. Closing #5028 [ci skip]
In Ubuntu Chrome, in the last lines of code blocks, the underscore isn't
visible. Increasing the line height slightly seems to fix this. This
problem doesn't exist in Firefox even on Ubuntu. Too lazy to test in
any other OS-browser combo :)
2012-03-03 23:49:37 +05:30
Santiago Pastorino
520571ac8a Turn off verbose mode of rack-cache, we still have X-Rack-Cache to check that info
Closes #5245
2012-03-03 00:29:02 -02:00
Aaron Patterson
af02291871 only log an error if there is a logger. fixes #5226
Conflicts:

	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
2012-03-02 10:28:06 -08:00
Santiago Pastorino
8674823350 Add CHANGELOG entry 2012-03-02 14:34:23 -02:00
Carlos Antonio da Silva
5fd360133a Stop SafeBuffer#clone_empty from issuing warnings
Logic in clone_empty method was dealing with old @dirty variable, which
has changed by @html_safe in this commit:
139963c99a

This was issuing a "not initialized variable" warning - related to:
https://github.com/rails/rails/pull/5237

The logic applied by this method is already handled by the [] override,
so there is no need to reset the variable here.
2012-03-02 16:05:46 +01:00
Piotr Sarnacki
1a71e84ad8 Fix #5238, rendered_format is not set when template is not rendered 2012-03-02 12:50:36 -02:00
Xavier Noria
bbe7dac223 revert setting NOT NULL constraints in add_timestamps
Commit 3dbedd2 added NOT NULL constraints both to table
creation and modification. For creation the new default
makes sense, but the generic situation for changing a
table is that there exist records. Those records have
no creation or modification timestamps, and in the
general case you don't even know them, so when updating
a table these constraints are not going to work. See
a bug report for this use case in #3334.
2012-03-01 16:16:31 -08:00
Aaron Patterson
c2897901de Merge branch '3-2-2' into 3-2-stable
* 3-2-2:
  bumping to 3.2.2
  Ensure [] respects the status of the buffer.
  Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare
  Merge pull request #5084 from johndouthat/patch-1
  updating RAILS_VERSION
  delete vulnerable AS::SafeBuffer#[]
  use AS::SafeBuffer#clone_empty for flushing the output_buffer
  add AS::SafeBuffer#clone_empty
  fix output safety issue with select options
2012-03-01 09:51:51 -08:00
Aaron Patterson
01b470f526 bumping to 3.2.2 2012-03-01 09:16:28 -08:00
Aaron Patterson
c60c1c0812 Merge branch '3-2-stable-security' into 3-2-2
* 3-2-stable-security:
  Ensure [] respects the status of the buffer.
  delete vulnerable AS::SafeBuffer#[]
  use AS::SafeBuffer#clone_empty for flushing the output_buffer
  add AS::SafeBuffer#clone_empty
  fix output safety issue with select options
2012-03-01 09:05:34 -08:00
José Valim
55ac1b9d88 Ensure [] respects the status of the buffer. 2012-02-29 16:13:29 -08:00
Aaron Patterson
5bb5780f7b Merge pull request #5206 from kennyj/fix_5173-32
[3-2-stable] Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931
2012-02-29 11:53:32 -08:00
kennyj
f1f2e8c80b Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931. 2012-02-29 01:23:37 +09:00
Aaron Patterson
72ae0b4b07 call binmode on the tempfile for Ruby 1.8 compatibility 2012-02-27 11:57:18 -08:00
Aaron Patterson
210c33f352 Merge pull request #5190 from rafaelfranca/fix-393-3-2-stable
[3-2-stable] Add a new line after the textarea opening tag.
2012-02-27 11:12:59 -08:00
Aaron Patterson
b543f8f88c Merge pull request #5179 from RalphShnelvar/Binary_mode_Window_bug
Binary mode window bug
2012-02-27 10:10:34 -08:00
Rafael Mendonça França
2b4e7a784e Add a new line after the textarea opening tag.
Closes #393
2012-02-27 13:57:32 -03:00
Rafael Mendonça França
663904f869 Revert "No need to pass options which is never used"
Options is needed for some Rails extensions to determine when
referential integrity should be disabled

This reverts commit bcb466c543.

Fixes #5052
2012-02-26 12:08:44 -08:00
Andrew White
b8c4f2d545 Adding tests for non-optional glob parameters 2012-02-26 00:21:08 +00:00
Ralph Shnelvar
06dc8ed289 Fixing Windows asset tag helper test failure
In asset_tag_helper_test.rb there is an assert on the number of bytes in a
concatenated file.  This test failed because Windows converts \n to \r\n as
the default for "w".  This is different than in *nix systems where there is
no conversion done.

THe test that failed was test_caching_stylesheet_link_tag_when_caching_on

Using bin mode fixes this behavior on windows and makes no change on the
*nix systems.
2012-02-25 15:35:29 -07:00
Justin Woodbridge
b229bc70e5 Fix typo in match :to docs 2012-02-25 21:54:59 +05:30