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 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.
...
This comparison is big! We’re only showing the most recent 250 commits
Commits on Mar 17, 2012
@rafaelfranca rafaelfranca Rack::SSL -> ActionDispatch::SSL 9ec63eb
@rafaelfranca rafaelfranca Some refactoring and update ActionDispatch::SSL code to use the Rack …
…1.4.x
041f4ee
@rafaelfranca rafaelfranca Whitespaces :scissors: 919afca
@rafaelfranca rafaelfranca Update the guides and CHANGELOG da5a47e
@rdavila rdavila Fix typo in ActiveRecord::Relation#blank? test 9679d40
@josevalim josevalim Merge pull request #5488 from rafaelfranca/ad-ssl
Remove Rack::SSL in favour of ActionDispatch::SSL
adadd86
@josevalim josevalim Merge pull request #5489 from rdavila/fix_typo_activerecord_test
Fix typo in ActiveRecord::Relation#blank? test
0061496
@drogus drogus Rubyracer does not work on ruby, so add it to Gemfile with :ruby plat…
…form only
c513ae3
Commits on Mar 18, 2012
@radar radar [getting started] Add images edad287
@radar radar [getting started] [ci skip] Just want to get post params 62d3693
@radar radar [getting started] [ci skip] Explain in better terms what we are doing…
… with render and params[:post] inspection upon first use
b30cc24
@radar radar [getting started] Explain what the create action is accomplishing aft…
…er params are output

[ci skip]
ef0821b
@MarkMT MarkMT Revised description for responds_with 98b4ef7
@MarkMT MarkMT Merge remote-tracking branch 'origin/master' f2bc404
@MarkMT MarkMT Merge remote-tracking branch 'origin/master' a188a1d
@tenderlove tenderlove Merge pull request #5486 from kennyj/fix_5435
Fix GH #5435. db:structure:dump should be re-enable.
2b5cb1c
@arunagw arunagw Build fix for app_generator_test.rb 62e0337
@armstrjare armstrjare Fix bug with autosave collection association on new record with a mar…
…ked for destroy record in autosave collection.
f1903d8
@MarkMT MarkMT Revised comments for respond_with 9e98d2d
@MarkMT MarkMT respond_with description: changed 'response' to 'format' d25d3fb
@atd atd time_tag support for blocks 0540644
@josevalim josevalim Merge pull request #5496 from atd/master
time_tag support for blocks
0c18faf
@josevalim josevalim Merge pull request #3329 from armstrjare/autosave_collection_new_reco…
…rd_bug

Autosave association doesn't save all records on a new record for a collection association if there are records marked for destruction
d802a6c
@drogus drogus Merge pull request #5492 from arunagw/build_fix_app_generator_test
Build fix for app_generator_test.rb
d3bbb23
Commits on Mar 19, 2012
@mikel mikel Increase minimum version of mail.
  Second security vulnerability found in mail file delivery method
  patched in version 2.4.4.
24d244c
@jeyb jeyb Fixes issue #5222: DateTimeSelector builds invalid dates on leap day …
…when discarding both day and month.
d2d2fc0
@sandeepr-sourcebits sandeepr-sourcebits changed all.map to pluck 70a19b7
@FND FND Provide access to logger instance within TaggedLogging blocks
this improves encapsulation, simplifying occurrences like the following:

    Rails.logger.tagged("DEBUG") { Rails.logger.debug(msg) }

... by removing the need to rely on (i.e. repeat) outer variables:

    Rails.logger.tagged("DEBUG") { |logger| logger.debug(msg) }
e0ee14e
@josevalim josevalim Merge pull request #5508 from FND/tagged_logger_shortcut
Provide access to logger instance within TaggedLogging blocks
98dc67c
@fxn fxn Merge pull request #5507 from sandeepravi/warning_fixes
changed all.map to pluck
50b3113
@sandeepr-sourcebits sandeepr-sourcebits -h also shows help options. 426840c
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails 9c748f3
@pixeltrix pixeltrix Merge pull request #5503 from jeyb/leap_day_time_date_time_selector
Fixes issue #5222: DateTimeSelector builds invalid dates on leap days
09d884c
@rafaelfranca rafaelfranca Remove exclude option from ActionDispatch::SSL 139bf55
@rafaelfranca rafaelfranca Fix secure cookies when there are more than one space before the secure
keyword
6e04a78
@josevalim josevalim Merge pull request #5515 from rafaelfranca/remove-exclude
Remove exclude option from ActionDispatch::SSL and fix secure cookies
ae97715
@bionicpill bionicpill Adding comma to correct syntax in comment. b3d4799
@rafaelfranca rafaelfranca Remove code duplication a26dcb6
Commits on Mar 20, 2012
Charles Brian Quinn Updates ActionMailer Base summary and fixes space in code example. c291195
Charles Brian Quinn Merge branch 'master' of github.com:lifo/docrails 884cb24
@dburt dburt Correct description of ['migrated_at > ?', 1.week.ago] from "more tha…
…n a week ago" to "more recently than a week ago."
a4b1423
@kennyj kennyj Add missing require c5b3cbc
@fxn fxn Merge pull request #5524 from kennyj/add_missing_require
Add missing require
5c1f389
@vijaydev vijaydev guides location has changed [ci skip] ae88ec4
@tenderlove tenderlove bigdecimal can be duped on Ruby 2.0 440559f
@tenderlove tenderlove search private and protected methods for convert_key c317c5b
@MarkDBlackwell MarkDBlackwell [ci skip] Make guides more readable & consistent 4a1a018
@tenderlove tenderlove probably should require the objects we monkey patch. bdf7624
@dhh dhh We dont need to merge in the parameters as thats all being reset by t…
…he rack headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing)
b49a7dd
@xuanxu xuanxu Fixed-width font fix for instance variable 50fc5a2
Commits on Mar 21, 2012
@mhfs mhfs Remove blank line from generated migration c63306b
@schneems schneems fix rails server support of RAILS_ENV variable
When launching rails server from the command line with a rails environment specified such as `rails server RAILS_ENV=production` an error would occur since rails will try to use `RAILS_ENV=production` as it's server. 

When launching rails with a specified server such as thin `rails server thin RAILS_ENV=production` no error will be thrown, but rails will not start up in the specified environment.

This fixes both of those cases
0a555dd
@travisjeffery travisjeffery Generate Migration Thats Adds Removed Index
When generating a migration that removes a field with an index, the down
will add both the field and its index.
b2a5938
@josevalim josevalim Merge pull request #5522 from travisjeffery/fix_migration_generator_a…
…dding_removing_index

Fix adding/removing field's index when generating migration
2884567
@josevalim josevalim Merge pull request #5532 from mhfs/migration_blank_line
Remove blank line from generated migration
14b2cf6
@tenderlove tenderlove split subscribers based on pattern type d99c790
@jonleighton jonleighton no need for lvar 7c1275a
@jonleighton jonleighton no need for cast 884e5b7
@jonleighton jonleighton Remove valid_scope_name? check - use ruby
scope is syntactic sugar for defining a class method. Ruby allows
redefining methods but emits a warning when run with -w. So let's
not implement our own logic for this. Users should run with -w if they
want to be warned about redefined methods.
f6db31e
@jonleighton jonleighton Avoid obscure &Proc.new thing fd68bd2
@jonleighton jonleighton Deprecate eager-evaluated scopes.
Don't use this:

    scope :red, where(color: 'red')
    default_scope where(color: 'red')

Use this:

    scope :red, -> { where(color: 'red') }
    default_scope { where(color: 'red') }

The former has numerous issues. It is a common newbie gotcha to do
the following:

    scope :recent, where(published_at: Time.now - 2.weeks)

Or a more subtle variant:

    scope :recent, -> { where(published_at: Time.now - 2.weeks) }
    scope :recent_red, recent.where(color: 'red')

Eager scopes are also very complex to implement within Active
Record, and there are still bugs. For example, the following does
not do what you expect:

    scope :remove_conditions, except(:where)
    where(...).remove_conditions # => still has conditions
0a12a5f
@mhfs mhfs Avoid another blank line in generated migration and remove assertion …
…as per @spastorino request
86d1dfb
@tenderlove tenderlove push the autoloads up to requires 60736fe
@tenderlove tenderlove start / finish events are sent by the instrumenter f08f875
@tenderlove tenderlove evented subscribers work 6989db9
@tenderlove tenderlove evented listeners can subscribe to any message c7847f1
@tenderlove tenderlove remove duplicate requires. thanks @atambo b6c128d
Commits on Mar 22, 2012
@drogus drogus Merge pull request #5540 from mhfs/another_blank_line_fix
Avoid another blank line in generated migration and remove assertion as per @spastorino request
6424922
@kucaahbe kucaahbe improvements in "caching_with_rails" guide 152798f
adman65 [engines] [ci-skip] Add example of precompiling engine assets 5fdcda8
adman65 Update config.assets.initialize_on_precompile warning to include engi…
…ne side affects
d3223b5
@mptre mptre Fixed missing space bug introduces in rails/rails@9299bfd. c5f4b20
@joegoggins joegoggins Adding documentation for ActiveRecord::Base.abstract_class to clarify…
… a particular usecase for this feature (to allow you to use inheritance in ActiveRecord without using the STI table name
65a3020
@schneems schneems match rails console environment support, to server
rails server takes `-e` as an argument to specify RAILS_ENV, rails console currently does not have the same interface. This commit fixes this disparity so developers can manually specify `RAILS_ENV` or can pass in an environment with a `-e`.
7529283
@lest lest deprecate Proc#bind that can cause symbol memory leak 9c857db
@tenderlove tenderlove Merge pull request #5552 from lest/patch-3
deprecate Proc#bind that can cause symbol memory leak
fad83d8
@tenderlove tenderlove properly namespace the fixture exception b4115fd
Commits on Mar 23, 2012
@drogus drogus Merge pull request #5546 from mptre/master
Fixed missing space bug introduces in rails/rails@9299bfd
39961f8
@Mik-die Mik-die :foreign_key option should be on has_many side of association 44ef59f
@drogus drogus Fix tests, when creating rescue handler, we need to check for arity now
Before it was handled by Proc.bind, but since Proc.bind has been
deprecated, this is no longer the case and returned handler
needs to match rescuer.
d1887d3
@carlosantoniodasilva carlosantoniodasilva Properly deprecate the block argument in AV FormBuilder
Commit 56089ca introduced a backward
incompatible change by changing the method signature of the FormBuilder.
This brings back the same method signature warning in case someone gives
a block to the builder.

More info: rails@56089ca#commitcomment-1116166
7a0cf2f
@josevalim josevalim Merge pull request #5374 from nertzy/remove_deprecated_partial_path_f…
…rom_active_model_naming

Remove ActiveModel::Naming#partial_path
35e8de6
@rafaelfranca rafaelfranca Use the new scope syntax ab287c5
@drogus drogus Merge pull request #5556 from rafaelfranca/remove-warning
use the new scope syntax on the tests to avoid DEPRECATION WARNINGS.
9a26c90
@josevalim josevalim Merge pull request #5518 from rafaelfranca/minor-refactor
Remove code duplication
86cd1b1
@tenderlove tenderlove Merge pull request #5550 from schneems/schneems/server_env
Fix environment support for rails server, and match interface of rails console
e944b29
@tenderlove tenderlove chdir before globbing so that we don't need to escape directory names.
fixes #5521
7422f44
@tenderlove tenderlove oops, forgot to commit the tests! :bomb: ea482d3
@lest lest fix HashWithIndifferentAccess.[] method 2ee28b2
Fabián Rodríguez [getting started][ci skip] fix link to the code b99d95d
Commits on Mar 24, 2012
@tpope tpope Return an actual boolean from xml_http_request? 6349791
@tenderlove tenderlove Merge pull request #5567 from tpope/xhr-boolean
Return an actual boolean from xml_http_request?
beb51b4
@arunagw arunagw removed warning: shadowing outer local variable - exception ef864c3
@vijaydev vijaydev spacing fix in guide [ci skip] 2fab826
@vijaydev vijaydev Merge pull request #5569 from arunagw/warning_remove_master
removed warning: shadowing outer local variable - exception
780ab58
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails
Conflicts:
	guides/source/ruby_on_rails_guides_guidelines.textile
014498e
@sent-hil sent-hil [ci skip] updated bin/rails code in Rails Initialization Process guide 7feec40
@avakhov avakhov ActionController caching small String#split optimization 6880489
@avakhov avakhov Fix AC actions caching comment 23b3ea5
@waseem waseem Use one 'be'. 9ff2e92
@pmatsinopoulos pmatsinopoulos Testing Template and Layout Example 214b0dd
@pmatsinopoulos pmatsinopoulos Small layout correction 5b35664
@pmatsinopoulos pmatsinopoulos Testing layout gotcha when view renders partial c12b886
@schneems schneems document `-e` argument for rails console
this adds documentation for -e flag which sets the environment of the rails console like the `rails server` command.
2314490
@fxn fxn Revert "Return an actual boolean from xml_http_request?"
Reason: This commit changes code that was committed some year
and a half ago. The original code is an ordinary predicate
that delegates straight to a boolean operator with no further
unnecessaru adorments, as clearly explained in #5329.

This change also may confuse users who may now believe they can
rely now on singletons, while predicates in Rails rely on
standard Ruby semantics for boolean values and guarantee no
singletons whatsover.

This reverts commit 6349791.
3756a3f
Commits on Mar 25, 2012
@jeremy jeremy Merge pull request #5570 from avakhov/ac-caching-split
ActionController caching small String#split optimization
64ccb59
@drogus drogus Merge pull request #5566 from lest/patch-3
fix HashWithIndifferentAccess.[] method
a4bf304
@fxn fxn restores example depicting the use of true or false in regular font
There was an example here that mentioned reload_plugins?
but it was deleted. This commit puts another example back.
7cc797f
Commits on Mar 26, 2012
@phiggins phiggins Remove useless conditional. 68926dd
@fxn fxn Merge pull request #5575 from phiggins/remove_conditional_from_statis…
…tics_task

Remove useless conditional.
8954ee6
@jamie jamie Allow a defining custom member field on resources
By default, resources routes are created with :resource/:id. A model
defining to_param can make prettier urls by using something more
readable than an integer ID, but since the route picks it up as :id you
wind up with awkward User.find_by_username(params[:id]) calls.

By overriding the key to be used in @request.params you can be more
obvious in your intent.
3e67e45
@chendo chendo Remove 'needless boolean casting'.
"Predicates in Rails rely on standard Ruby semantics for boolean values
and guarantee no singletons whatsoever." - @fxn
ef64c6b
@josevalim josevalim Merge pull request #5581 from jamie/custom_param_field
Allow a defining custom member field on resources
adb802e
@josevalim josevalim Merge pull request #5183 from lest/patch-1
use content_tag in button_to helper
1d59caa
@ddefrenne ddefrenne Fixed typo in path 492e91c
@ddefrenne ddefrenne Made it a bit more clear where to run rails/server ddab3df
Lukasz Sarnacki ActiveModel::Name does not inherit from string 72cbccb
@nashby nashby String#titleize works properly with smart quotes, closes #5584 633ee64
@tenderlove tenderlove Merge pull request #5593 from lukesarnacki/activemodel_name_compositi…
…on_over_inheritance

ActiveModel::Name does not inherit from string
e8b5c8e
@tenderlove tenderlove test against ruby features in order to fix tests on Ruby 2.0 6289f45
@tenderlove tenderlove no need to freeze things all the time 65f4d80
@lest lest apply form_for namespace option to date_select 65434a2
@guilleiguaran guilleiguaran sprockets-rails 1.0.0 was released, remove git dependency from Gemfile dd74da7
@tenderlove tenderlove Merge pull request #5595 from guilleiguaran/sprockets-rails-1.0.0
sprockets-rails 1.0.0 was released, remove git dependency from Gemfile
2e8129e
@gutenye gutenye ActiveRecord::Coders::YAMLColumn#dump should raise an error
closes #2737

Conflicts:

	activerecord/lib/active_record/coders/yaml_column.rb
9637de6
@drogus drogus Merge pull request #5594 from lest/patch-1
apply form_for namespace option to date_select
ea0789f
@tenderlove tenderlove Don't depend on ivars. Thanks @fesplugas 045197f
@xuanxu xuanxu Missing generated query for pluck method.
(and changed the use of true for a more database agnostic example).
fc25feb
Lukasz Sarnacki added shallow_prefix option description in documantation
It is in response for confusion in issue #5301
0c5ca07
@tenderlove tenderlove Merge pull request #5561 from carlosantoniodasilva/form-builder-block…
…-arg

Properly deprecate the block argument in AV FormBuilder
de9c0ef
@drogus drogus Merge pull request #5592 from nashby/fix-issue-5584
String#titleize works properly with smart quotes
a2126ab
@tenderlove tenderlove stop using *args in order to simplify our constructor 47db156
@carlosantoniodasilva carlosantoniodasilva Return the same session data object when setting session id 5ad9a8e
@tenderlove tenderlove eliminating a branch we do not need. thanks @jeremy 33da24a
@tenderlove tenderlove still need to ensure the path is a directory a2a861f
@tenderlove tenderlove Merge pull request #5331 from castlerock/remove_unused_require
remove unused require from AS/core_ext/class/delegating_att.rb
281b31b
@carlosantoniodasilva carlosantoniodasilva Remove warning added by my own commit :fire:
Commit: 7a0cf2f
2ceb3fc
@tenderlove tenderlove Merge pull request #5601 from carlosantoniodasilva/cookie-store-sessi…
…on-hash

Cookie store session hash
b36f240
Commits on Mar 27, 2012
@tenderlove tenderlove Merge pull request #2621 from icco/master
Issue with schema dump
41dfc46
@tenderlove tenderlove favor composition over inheritance 4946107
@drogus drogus Don't ignore non Enumerable values passed to sanitize (closes #5585)
When someone accidentally passes a string to sanitize like:

sanitize("<span>foo</span>", :tags => "b")

there is no indication that it's the wrong way and span
will not be removed.
37c84ed
@tenderlove tenderlove favor composition over inheritance bca7770
@fxn fxn Merge pull request #5582 from chendo/master
Remove "needless boolean casting"
ded74df
@avakhov avakhov Proc objects for caches_page no need controller object fbccdf9
@tjmcewan tjmcewan change number_with_precision to not return negative zeros 7051a23
@arunagw arunagw removed unused variables 4cd0b4e
@josevalim josevalim Merge pull request #5609 from tjmcewan/master
prevent returning a negative zero from number_with_precision
19901c6
@drogus drogus If partial is rendered in controller, grab format from template
Previously `rendered_format` was set only based on mime types
passed in Accept header, which was wrong if first type from
Accept was different than rendered partial. The fix is to simply
move setting rendered_format to the place where template
is available and grab format from the template. If it fails
we can fallback to formats passed by Accept header.
67b2404
@kryzhovnik kryzhovnik Fixing issue #2492 for master branch. ActionView::Base.field_error_pr…
…oc doesn't call for label.

objectify_options method should be applied to the proper options arg.

See explanation and example of the bug - https://github.com/kryzhovnik/rails_field_error_proc_bug_example
6ce0a6d
@spastorino spastorino Merge pull request #5499 from arunagw/remove_unused_code
removed unused variables
888fcca
@vijaydev vijaydev Revert "[ci skip] updated bin/rails code in Rails Initialization Proc…
…ess guide"

This reverts commit 7feec40.

Reason: The guide had the contents of railties/bin/rails and I don't see
any reason to change it.
286259f
@cbartlett cbartlett Fix indenting in migration generator
    $ rails generate migration remove_foo_from_bars foo:string

This currently generates:

      def up
        remove_column :bars, :foo
          end

Fix it:

      def up
        remove_column :bars, :foo
      end
e5156c9
@vijaydev vijaydev add missing do [ci skip] e01beb5
@vijaydev vijaydev minor edits in testing guide [ci skip] ae040ed
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails b42fbd3
@tenderlove tenderlove attributes are cached by string keys, so to_s to support symbols. fixes e96d04a
@jigfox jigfox adds delegetion for eof? to AD::Http::UploadedFile
if you want to read the file you may need to ask if there is something
to read from
96b72ef
@jcoleman jcoleman Don't break Haml with textarea newline fix.
See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.)

Also fix 6 more tests that didn't yet have the newline expectation.
1438e0e
@xuanxu xuanxu Remove Arel::Relation constant from PredicateBuilder. 2fa7ccf
@spastorino spastorino Merge pull request #5620 from jcoleman/textarea-newline-fix-breaks-ha…
…ml-master

Don't break Haml with textarea newline fix. (master)
33164c8
@franckverrot franckverrot Rails.initialized? can be called at any time without raising an excep…
…tion [Closes #2507]

Changes:

* `Rails.initialized=` has been removed
* `Rails.initialized?` and `Rails.application.initialized?` are now
* delegating to `MyApp::Application.initialized?`
4882271
@rafaelfranca rafaelfranca Check if the options hash already exists and merge it with the another
hash.

Closes #2492 and #5615
32763a8
@Houdini Houdini remove redundant variable ba9537c
@jeremy jeremy Merge pull request #5621 from rafaelfranca/fix-2492-master
Fix label_tag to merge the options hash with the object hash
da5f656
Commits on Mar 28, 2012
@spastorino spastorino Merge pull request #5616 from cbartlett/migration-indent
Fix indenting in migration generator
a3e5b7b
@andhapp andhapp Changed the config.assets.manifest path in the comments to nil. e798000
@andhapp andhapp Improved the comment for config.assets.manifest in the asset_pipeline…
… guides.
47320e9
@andhapp andhapp Changed the config.assets.manifest to nil in the comments in the prod…
…uction config template.
77fedae
@josevalim josevalim Merge pull request #5623 from Houdini/master
Remove redundant variable from core_ext/hash/deep_dup.rb
647ccdc
@josevalim josevalim Merge pull request #2528 from cesario/fix_2507
Rails.initialized? can be called at any time without raising an exception [Closes #2507]
0560ce0
@ktheory ktheory Add test for default_url_options[:port] 0c525f6
@spastorino spastorino Merge pull request #5630 from andhapp/fix-config-asset-manifest
Changed the config.assets.manifest to nil
9897b9a
@jonleighton jonleighton much code can be deleted thanks to @tenderlove's refactoring 6cff090
@drogus drogus Added config.action_view.embed_authenticity_token_in_remote_forms
There is a regression introduced in 16ee611, which breaks
remote forms that should also work without javascript. This commit
introduces config option that allows to configure this behavior
defaulting to the old behavior (ie. include authenticity token
in remote forms by default)

Conflicts:

	actionpack/CHANGELOG.md
805b15f
@drogus drogus config.action_view.embed_authenticity_token_in_remote_forms is true b…
…y default

Changed default value for `config.action_view.embed_authenticity_token_in_remote_forms`
to `false`. This change breaks remote forms that need to work also without javascript,
so if you need such behavior, you can either set it to `true` or explicitly pass
`:authenticity_token => true` in form options
128cfbd
@drogus drogus Cover one more case in auth_token and remote forms
If embedding auth_token in remote forms is off and we
pass a value for auth_token it should respect it.
5a5ca14
@drogus drogus Allow ActiveModel::Name to duck type c82fd8f
@andersondias andersondias Fix quotes at select_tag examples 6410d21
@josevalim josevalim Add a test case for layout nil. dd0275e
@joevandyk joevandyk datetime_select should work with -/+ infinity dates b9cbadf
@bsodmike bsodmike clarification to prevent confusing newbies; Passenger/Unicorn are app…
… servers, Apache/Nginx are the web servers along with thin a la Heroku etc.
7708819
@henrik henrik Routing guide: document lambda constraints and request argument. 4a26b22
Tony Primerano CSRF messages are no longer controlled by 422.html because InvalidAut…
…henticityToken is not raised
e810843
@spastorino spastorino Set proper rendered_format when doing render :inline
Closes #5632
f0268d5
@rafaelfranca rafaelfranca Remove code duplication in InclusionValidator and ExclusionValidator.
Orginal code by @jamescook

Closes #1352

[Rafael Mendonça França + James Cook]
170956c
@spastorino spastorino Merge pull request #5643 from rafaelfranca/remove-duplication
Remove code duplication in InclusionValidator and ExclusionValidator.
ddaeb4b
@fxn fxn Merge pull request #4843 from seamusabshere/patch-1
Possibly clearer way of getting rid of ` and "
bbd2cae
Jonathan Mukai & Peter Jaros Nested attribute setters can be overridden.
Overriding implementation can call super.
135d704
@nertzy nertzy Test that render gets correct exact template name a0e83d5
Commits on Mar 29, 2012
@nertzy nertzy Make controller namespace partial prefix optional
config.action_view.prefix_partial_path_with_controller_namespace

This allows you to choose to render @post using
/posts/_post.erb instead of /admin/posts/_post.erb
inside Admin::PostsController.
18d275a
@spastorino spastorino Merge pull request #5359 from avakhov/missed-commits-from-3-2-stable
Missed commits from 3-2-stable
c4d90e4
@josevalim josevalim Merge pull request #4904 from ask4prasath/refactor_dirty_module_with_…
…helper

Changing active model dirty module helper method to more appropriate met...
e83e76e
@josevalim josevalim Merge pull request #5625 from nertzy/prefix_partial_path_with_control…
…ler_namespace

Add config option to turn off prefixing partial path with controller namespace
e51322a
@Empact Empact Drop unnecessary require in Rails::Paths 4977e14
@Empact Empact Drop Paths::Root initializer check of #path as it isn't checked in th…
…e #path= or anywhere else
f7a39c8
@Empact Empact Define Paths::Root#[]= in terms of #add. cec170b
@rafbm rafbm Make body background white for Lion scrollbar to be dark fe1e039
@tenderlove tenderlove Merge pull request #5617 from Empact/paths
Spring cleaning in Rails::Paths
1555023
@guilleiguaran guilleiguaran Add ActiveRecord::Base#slice to slice method calls 01ede9a
@guilleiguaran guilleiguaran CHANGELOG entry for AR#slice bb2e2d8
@jeremy jeremy Merge pull request #5345 from guilleiguaran/ar-slice
post.slice(:title, :content) # => { title: "Hello", content: "World" }
648248b
Commits on Mar 30, 2012
@carlosantoniodasilva carlosantoniodasilva Properly typecast id attribute when using custom primary key 77a0fc1
@carlosantoniodasilva carlosantoniodasilva Deprecate Column#type_cast_code f50c160
@tenderlove tenderlove Merge pull request #5661 from carlosantoniodasilva/ar-pk-typecast
Typecast 'id' attribute in read_attribute when using custom pks
130064d
@levi levi Introduce minor spelling corrections and fix broken markup tag. 03c051e
@lest lest use `symbolize_keys` instead of `dup.symbolize_keys!` f4d2695
@jonleighton jonleighton recurse in read_attribute we get caching / don't duplicate code 7dd7d76
@jonleighton jonleighton Merge pull request #2945 from Casecommons/nested_attributes_module
Nested attribute setters can be overridden.
3a8c543
@jonleighton jonleighton Add Relation#find_by and Relation#find_by! 13b3c77
@jonleighton jonleighton remove irrelevant references to ARel 96b8192
@jonleighton jonleighton Update guides to reflect 0a12a5f 84338aa
@plashchynski plashchynski validate attribute names in class and module attribute accessors 96b951c
@jonleighton jonleighton fix typo. thanks @nertzy b69298e
@josevalim josevalim Merge pull request #5668 from plashchynski/validate_attribute_name_in…
…_class_and_module_attribute_accessors

validate attribute names in class and module attribute accessors
34320cd
@jonleighton jonleighton Merge pull request #5334 from courtland/master
Fix deleting from a HABTM join table upon destroying an object of a model with optimistic locking enabled.
2eb1118
@jonleighton jonleighton whitespace :scissors: bd40e5c
@jonleighton jonleighton fix test 43f9622
@jonleighton jonleighton clear up duplication between Persistence#destroy and Locking#destroy 1ce7545
@spastorino spastorino Remove the leading \n added by textarea on assert_select 1141f71
@jonleighton jonleighton Fix #5667. Preloading should ignore scoping. 86aefdb
@avakhov avakhov Remove AC::RenderError class second declaration 0d2a400
@drogus drogus Merge pull request #5673 from avakhov/ac-render-exception
Remove AC::RenderError class second declaration
c3d482f
@avakhov avakhov Remove obsolete reader from AC::MethodNotAllowed exception class 891392a
Commits on Mar 31, 2012
@tenderlove tenderlove Merge pull request #4911 from Floppy/master
Reduce FILENAME_MAX_SIZE in ActiveSupport::Cache::FileStore
ad95a61
@tenderlove tenderlove use tsort_each to avoid intermediary array 25f1d5d
@arunagw arunagw warning removed: (...) interpreted as grouped expression 40c38d9
@spastorino spastorino Merge pull request #5674 from avakhov/ac-exception-remove-obsolete-me…
…mber

Remove obsolete reader from AC::MethodNotAllowed exception class
fde48f7
@rafbm rafbm Reorder bits in the Layouts and Rendering guide bf8c3eb
@drogus drogus Merge pull request #5664 from lest/patch-1
use `symbolize_keys` instead of `dup.symbolize_keys!`
3e75acb
@vijaydev vijaydev Merge pull request #5679 from arunagw/warning_removed_master
warning removed: (...) interpreted as grouped expression
267d617
@arunagw arunagw No more BufferedLogger so it can be LoggerTest 6a24082
@arunagw arunagw no more deprecation required. 27a8e69
@spastorino spastorino Merge pull request #5683 from arunagw/buffered_logger_test
No more BufferedLogger so it can be LoggerTest
c81f85d
@arunagw arunagw warning removed: `&' interpreted as argument prefix dab9638
@spastorino spastorino Remove not needed requires 67b000e
Commits on Apr 01, 2012
@tenderlove tenderlove use undef_method to avoid NameError exceptions all the time 0244c0d
@nertzy nertzy Don't include deprecation in AM::Naming anymore ee235b3
@avakhov avakhov Block version of label should wrapped in field_with_errors in case of…
… error
889bb4b
@avakhov avakhov Tests :if option of force_ssl method 7f6bb2d
@avakhov avakhov Small #label method refactoring, thanks @rafaelfranca 806f4d8
hardi Useless/Confusing method definition removed d578bd4
@josevalim josevalim Merge pull request #5692 from avakhov/force-ssl-if-test
Tests :if option of force_ssl method
e357d5b
@josevalim josevalim Merge pull request #5690 from nertzy/remove_naming_deprecation_include
Don't include deprecation in ActiveModel::Naming anymore
9228aa6
@josevalim josevalim Merge pull request #5691 from avakhov/form-label-block
Block version of label should wrapped in field_with_errors in case of error
eb154c5
Erich Menge :success includes the whole 200 range, not just 200.
  # File lib/rack/response.rb, line 114
114:       def successful?;    @status >= 200 && @status < 300;       end
6e814ce
@vijaydev vijaydev copy editing [ci skip] a5a9fc9
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails cf18298
@vijaydev vijaydev Merge pull request #5684 from arunagw/warning_removed_railties
warning removed: `&' interpreted as argument prefix
4850f2e
@spastorino spastorino Merge pull request #5694 from hardipe/master
Tidy up cookies.rb a bit
fa1645a
@drogus drogus Usage file in generators shouldn't be fetched only based on source_root
In case `source_roout` is not set, `default_source_root` is used,
which includes also `templates` directory. If there is no `templates`
directory, `default_source_root` is not available and USAGE will not
be displayed. USAGE should be also checked based on default
directory excluding `templates`.
fff3e75