Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

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
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Oct 18, 2012
@mrbrdo mrbrdo add credit to committer of pull request #6569 a774354
@rafaelfranca rafaelfranca Merge pull request #7990 from mrbrdo/master
Credit for previous commit [ci skip]
55d153e
@butcher butcher Extend date_select helper functionality. a48ef9b
@rafaelfranca rafaelfranca Fix the app_generator and plugin_new tests 12fb937
@rafaelfranca rafaelfranca Don't use action_controller.perform_caching to enable rack-rack.
Setting the action_dispatch.rack_cache options to true or a hash should
be the way to enable it.
90733e7
@rafaelfranca rafaelfranca Remove warning setting eager_load ff79df0
@rafaelfranca rafaelfranca Merge pull request #7975 from butcher/extend_date_select_helper_funct…
…ionality

Extend date_select helper functionality.

Conflicts:
	actionpack/CHANGELOG.md
11acaa1
@frodsan frodsan add a nested attributes example into Strong Parameters documentation …
…[ci skip]
2834454
@tenderlove tenderlove some ruby interpreters don't have ruby-prof so just skip the tests
rather than exiting the process.
4f106bb
@thedarkone thedarkone Make DescendantsTracker thread safe and optimize the #descendants met…
…hod.
9f84e60
@tenderlove tenderlove fix assertions a3ad0a7
@acoffman acoffman Change 'branches' to 'branch' [ci skip] d774f4c
@tenderlove tenderlove prefer composition over inheritence 6ea781c
@tenderlove tenderlove add test for fetch with a block b2debfb
@tenderlove tenderlove move cache inside the instance so we do not need locking 13655a4
@tenderlove tenderlove eagerly populate the http method loookup cache so we don't need locks 872d8c3
@thedarkone thedarkone There is already a Set of non-hidden action_names lying around. 7cc5bf5
@tenderlove tenderlove initialize required instance variables for this mixin 210c841
@tenderlove tenderlove if no filters are supplied, default to an empty list 57d3817
@tenderlove tenderlove simplify filter enabled checking c6c6ffb
Commits on Oct 19, 2012
@tenderlove tenderlove prevent people from accidentally modifying the filter word 6c3166a
@tenderlove tenderlove nil isn't a valid filter be9fc77
@tenderlove tenderlove move compiled filters to their own class so that recursive calls don't
need to check for the length of @filters
79e91cc
@tenderlove tenderlove keep a singleton filter around that we can use when no filter is set 481f30e
@tenderlove tenderlove oops, forgot the default parameter 73de222
@tenderlove tenderlove add another singleton for environment filtering 8654f8c
@tenderlove tenderlove synchronize on param filter cache.
Do we actually need this cache?
0d7b0f0
@frodsan frodsan remove assert_valid method from testing guide [ci skip] feb9c5f
@dogweather dogweather Corrected the logic in production.rb comment. b83e0c3
@jonleighton jonleighton Add Relation#find_or_create_by and friends
This is similar to #first_or_create, but slightly different and a nicer
API. See the CHANGELOG/docs in the commit.

Fixes #7853
eb72e62
@jonleighton jonleighton The default value of a text/blob in mysql strict mode should be nil
In non-strict mode it is '', but if someone is in strict mode then we
should honour the strict semantics.

Also, this removes the need for a completely horrible hack in dirty.rb.

Closes #7780
af8c8b4
@jonleighton jonleighton fix test :/ 45d585e
@jonleighton jonleighton nodoc the first_or_create methods and document alternatives 0096f53
@shime shime better examples in ActiveModel readme 2d2c823
@shime shime include serializers in ActiveModel::Serialization example aee07fe
@jonleighton jonleighton Rename the partial_updates config to partial_writes
This reflects the fact that it now impact inserts as well as updates.
7efb1fe
@carlosantoniodasilva carlosantoniodasilva Update rails gemspec to use sprockets-rails 2.0.0.rc1
So that we can bundle and travis can run our tests.
18e979e
@frodsan frodsan truncate debug.log on each test run 98043c6
@jonleighton jonleighton Get rid of the ActiveRecord::Model::DeprecationProxy thing.
I think it's going to be too much pain to try to transition the
:active_record load hook from executing against Base to executing
against Model.

For example, after Model is included in Base, and modules included in
Model will no longer get added to the ancestors of Base.

So plugins which wish to be compatible with both Model and Base should
use the :active_record_model load hook which executes *before* Base gets
loaded.

In general, ActiveRecord::Model is an advanced feature at the moment and
probably most people will continue to inherit from ActiveRecord::Base
for the time being.
8384683
@rafaelfranca rafaelfranca Merge pull request #7994 from frodsan/truncate_debug_log
truncate debug.log on each test run
2268859
@elpic elpic ActiveRecord Callbacks ordering examples d4db095
@yahonda yahonda Revert "truncate debug.log on each test run"
This reverts commit 98043c6.

Because if every time `debug.log` is truncated,
developers have no way to see the previous ActiveRecord unit test results.
`debug.log` file can be easily reduced
by executing `$ touch /dev/null > debug.log` periodically.
048866a
@rafaelfranca rafaelfranca Merge pull request #7996 from yahonda/revert_7994
Revert "truncate debug.log on each test run"

I'm reverting this since we may want to see SQL results of subsequent tests run, to, per example, copare them.

I didn't realized this first time but @yahonda pointed me out.
86df55e
@steveklabnik steveklabnik Add i18n scope to disance_of_time_in_words.
This fixes #733.
e22e785
@rafaelfranca rafaelfranca Merge pull request #7997 from steveklabnik/issue_733
Add i18n scope to disance_of_time_in_words.
c50de96
Commits on Oct 20, 2012
@adimichele adimichele Changed scope for "taken" error message translation to decrease prece…
…dence

Moved activerecord.errors.messages.taken to errors.messages.taken so that translations for, e.g., errors.attributes.email.taken don't get overridden.

Test that the translation for 'taken' can be overridden
f48b7cc
@rafaelfranca rafaelfranca Merge pull request #7995 from adimichele/master
Small change to active_record/locale/en.yml
5341b84
@rafaelfranca rafaelfranca We don't need this anymore since we had a sprockets-rails release bfc6c17
@carlosantoniodasilva carlosantoniodasilva Merge pull request #7951 from Grandrath/patch-1
Use `Rails.env` instead of `ENV['RAILS_ENV']`.
Fix behavior of `rake db:structure:load`.
c869ce0
@AvnerCohen AvnerCohen Hash Syntax changes to 1.9 format 71c67d1
@jeremy jeremy Revert "Get rid of the ActiveRecord::Model::DeprecationProxy thing."
This reverts commit 8384683.
4ed1563
@nashby nashby check_box value can be not only an object of Array class
there is a chance that `value` is a Set or an object that reponses to `include?` method so let's handle this case
3ee6bcf
@rafaelfranca rafaelfranca Merge pull request #8002 from nashby/checkbox-include
check_box value can be not only an object of Array class
3be9e8a
@rafaelfranca rafaelfranca Rotate the debug.log on each 100MB 64391cd
Commits on Oct 21, 2012
@frodsan frodsan nodoc AR::Generators [ci skip] 19a2673
@frodsan frodsan update AR::AttributeMethods documentation [ci skip] aceb4a5
@frodsan frodsan minor edits in AM documentation [ci skip] c9a88a2
@fxn fxn Merge pull request #7493 from steveklabnik/ajax_guide
Re-writing the AJAX Guide
cec66e5
@vijaydev vijaydev copy edits [ci skip] e842813
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails
Conflicts:
	activesupport/lib/active_support/core_ext/hash/slice.rb
	guides/source/active_support_core_extensions.md
f938019
@vijaydev vijaydev fix a couple of typos in the js guide [ci skip] 676ee78
@agis- agis- fix a typo 6d927fb
@agis- agis- Consistent headlines & ToC
I believe the topics and their headlines should be consistent for obvious reasons. Also
506257a
@agis- agis- Improve "request response" term typing & fix a minor typo a6d383c
@agis- agis- Explain where the acronym AJAX stands for & replace "JavaScript write…
…r" with "JavaScript developer"
1332cf5
@agis- agis- Improve grammar a bit 507e522
@agis- agis- Improve grammar 0033273
@agis- agis- Fix a typo 2767f01
@robin850 robin850 Wrap a piece of code to a code block d279d3e
@DevL DevL Fixes typo. 67ec9b7
@frodsan frodsan nodoc deprecated AR::Fixtures constant [ci skip] 4736c14
@frodsan frodsan fix StrongParameters example [ci skip] ae057d6
@GRoguelon GRoguelon Remove extra line in Gemfile under turbolinks. 1f74315
@rafaelfranca rafaelfranca Merge pull request #8006 from GRoguelon/master
Remove extra line in Gemfile generated
8059b82
@ccarruitero ccarruitero update AssetTagHelper documentation [ci skip] 0ce7ea6
@frodsan frodsan Fix AR::AttributeMethods#[] example [ci skip] 06e908c
@frodsan frodsan update AR::AttributeMethods::BeforeTypeCast docs [ci skip] c6fb832
@frodsan frodsan fix typo and improve example [ci skip] e32bbc1
@ccarruitero ccarruitero fix error in AssertTagHelper documentation [ci skip] 40b0cec
@AvnerCohen AvnerCohen More changes around 1.9 hash syntax
Added missing space in previous hash related commit
7fbb21d
Commits on Oct 22, 2012
@frodsan frodsan improve AR::AttributeMethods documentation [ci skip] bc3f960
@frodsan frodsan add docs to AR::AttributeMethods::BeforeTypeCast [ci skip] 1e5a6c7
@frodsan frodsan read_attribute is public [ci skip] ae27acb
@elpic elpic Changeing some code-styles of the examples & fix a typo on dependent …
…option
3e6b2f5
@elpic elpic Merge branch 'master' of https://github.com/lifo/docrails
Conflicts:
	activerecord/lib/active_record/callbacks.rb
e041a50
@htanata htanata Fix code example in AR::AttributeMethods::BeforeTypeCast. 01e38d8
@AvnerCohen AvnerCohen convert comments to 1.9 hash syntax 77eb1fb
@rafaelfranca rafaelfranca Add tests to make sure that the I18n taken message can be overrided i…
…n the

activerecord scope.

Related with 5341b84
78adc45
@frodsan frodsan fix output messages - docs [ci skip] 2ef4d5e
@tenderlove tenderlove frozen state should be restored after txn is aborted 4049643
Commits on Oct 23, 2012
@MGalv MGalv Fixed typo on ActiveRecord nested_attributes. 6004fd3
@noahhendrix noahhendrix pass the key to the block in cache.fetch on misses 81b7112
@timsly timsly changed test case name ff29dd8
@rafaelfranca rafaelfranca Merge pull request #8014 from insside/task-test-typos
changed test case name
a5744f0
@AvnerCohen AvnerCohen Another batch of hash syntax changes to comment, this time around, I …
…tried to keep 'output' messages untouched.
30d2627
@AvnerCohen AvnerCohen Updated activerecord test comments to new hash syntax 3b89052
@fxn fxn adds Rails to the title of the JS guide [ci skip] c145f35
@fxn fxn renames the JS guide file name to match the new title [ci skip] 69e9715
@fxn fxn JS guide: AJAX -> Ajax
We discussed this on Twitter, seems to be the best option.
8c38172
@fxn fxn registers the JS guide in the CHANGELOG [ci skip] c3d4fc4
@fxn fxn JS guide: applies guides casing guidelines for titles [ci skip] 9d66c40
@AvnerCohen AvnerCohen Migration of docs to 1.9 hash syntax 9edd4e1
Commits on Oct 24, 2012
@noahhendrix noahhendrix make the cache test more @tenderlove(ing) and not depend on internal …
…implentation
96f5cea
@GRoguelon GRoguelon Adding a missing parenthesis in the doc of String#parameterize. 1e593db
@ugisozols ugisozols Fix incorrect markdown by removing extra space. 1a6b082
@rafaelfranca rafaelfranca Merge pull request #8021 from ugisozols/master
Fix incorrect markdown by removing extra space. [ci skip]
1582100
Andrii Dovgaliuk fix a typo in comments to ActiveRecord::Associations::Association.sta…
…le_state
211accc
@guilleiguaran guilleiguaran Update upgrading notes: users should stop using :concat and :cache op…
…tions in asset tags
276e7b0
@guilleiguaran guilleiguaran Update Upgrading Guide with removal of :cache and :concat options 53568e0
@guilleiguaran guilleiguaran With the Asset Pipeline the :cache and :concat options aren't used an…
…ymore
6250873
@fxn fxn Revert "Consistent headlines & ToC"
This reverts commit 506257a.
0f45570
@fxn fxn Revert "fix a typo"
This reverts commit 6d927fb.
7cbce85
@fxn fxn Revert "Improve "request response" term typing & fix a minor typo"
This reverts commit a6d383c.
c8dec40
@fxn fxn Revert "Explain where the acronym AJAX stands for & replace "JavaScri…
…pt writer" with "JavaScript developer""

This reverts commit 1332cf5.
fe47041
@fxn fxn Revert "Improve grammar a bit"
This reverts commit 507e522.
4fee5df
Commits on Oct 25, 2012
@henrik henrik AJAX -> Ajax in layouts_and_rendering guide.
Fixed in the JS guide in 8c38172
cc5dfcc
@tenderlove tenderlove Merge pull request #8013 from noahhendrix/master
Pass key to block in cache.fetch on miss
f5ae64d
@tenderlove tenderlove fix uninitialized ivar warnings 6033e8a
@tenderlove tenderlove do not lose backtrace information from the raised exception facd3e8
@tenderlove tenderlove give access to the original exception raised in case of a parse error cde326b
@tenderlove tenderlove remain backwards compatible, exception can be constructed with no arg…
…uments
59a53f4
@calebthompson calebthompson Fix gratuitous use of ternary operator 3d3fd39
@rafaelfranca rafaelfranca Merge pull request #8030 from calebthompson/fix-ternary
Fix gratuitous use of ternary operator
ca3b429
Commits on Oct 26, 2012
@frodsan frodsan encourage use of Ruby 1.9 syntax [ci skip] 65be1a0
@frodsan frodsan minor edits and remove mixed titles in AM::Validations docs [ci skip] 9ac095f
Vinny Diehl Update redcarpet dependency
"~> 2.2.2" from "~> 2.1.1". Also converted all hash rockets in the
Gemfile to the 1.9 syntax.
cadff7b
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8031 from gbchaosmaster/redcarpet-2.2.2
Update redcarpet dependency
91c5af4
@jeremy jeremy Add missing require for minitest assertions. Breaks calling 'app' in …
…console otherwise. See 94248ff.
a27b517
@jaimeiniesta jaimeiniesta Fix a pair of typos on Active Record Querying guide b1e5c16
@jonleighton jonleighton Remove ActiveRecord::Model
In the end I think the pain of implementing this seamlessly was not
worth the gain provided.

The intention was that it would allow plain ruby objects that might not
live in your main application to be subclassed and have persistence
mixed in. But I've decided that the benefit of doing that is not worth
the amount of complexity that the implementation introduced.
9e4c41c
@jeremy jeremy Remove REE GC stats since master is 1.9.3 00791bf
@carlosantoniodasilva carlosantoniodasilva Remove ActiveRecord::Model consant from AS::TestCase
Fixing the build.
7c7a225
@carlosantoniodasilva carlosantoniodasilva Remove ActiveRecord::Model entry from 4.0 Release Notes [ci skip] d200cb9
@jonleighton jonleighton remove unused config option 6ac33f9
@dgraham dgraham Implement replace method so key? works correctly. f38e752
@frodsan frodsan update AR::ImmutableRelation documentation [ci skip] 7a36dc7
@rafaelfranca rafaelfranca Merge pull request #7971 from dgraham/hash-replace
Implement HashWithIndifferentAccess#replace so key? works correctly.
f078f91
@veader veader Decode attributes pulled from URI.parse
The RFC indicates that username and passwords may be encoded.
http://tools.ietf.org/html/rfc2396#section-3.2.2

Found this trying to use the mysql://username:password@host:port/db and having special characters in the password which needed to be URI encoded.
f96b410
@rafaelfranca rafaelfranca Merge pull request #7593 from veader/patch-1
Decode attributes pulled from URI.parse
35f2a09
@agis- agis- Use a better word cc81af2
Vinny Diehl Organize README
* Organized code status badges into a "Code Status" section.
* Moved the OSI MIT License link inline (bullets are for unordered
  lists).
* Removed all EOL whitespace.

[ci skip]
c195aed
@jeremy jeremy Job worker thread logs to stderr if no logger is provided 411378e
@jeremy jeremy Job worker thread logs failed jobs too 26f52b2
@jeremy jeremy Job consumer logs to Rails.logger by default bf2009f
Commits on Oct 27, 2012
@jeremy jeremy Fix queueing tests that should be consuming the queue rather than dra…
…ining it
b794440
@frodsan frodsan AM::Serializers::Xml depends on AM::Naming 0703295
@frodsan frodsan fix AM::Serializers titles [ci skip] 10d9cb2
@jeremy jeremy Merge pull request #8038 from frodsan/fix_am_serializers_xml_dependency
Fix AM::Serializers::Xml dependency
94f6b3d
@frodsan frodsan fix failing isolated tests df2b60c
@jeremy jeremy Merge pull request #8040 from frodsan/fix_build_isolated
fix failing isolated tests in activemodel
67166c4
@senny senny cleanup, remove trailing whitespace within actionpack 4d7f533
@rafaelfranca rafaelfranca Merge pull request #8043 from senny/remove_trailing_whitespace_in_act…
…ionpack

remove trailing whitespace within actionpack [ci skip]
f3807a8
@rafaelfranca rafaelfranca Add the Working with JavaScript Guides in the guides home as WIP e3dad96
@fxn fxn Merge pull request #8034 from gbchaosmaster/readme-format
Organize README
028f29d
@rafaelfranca rafaelfranca Improve the deprecation message of link_to_function and
button_to_function

Point the the Unobtrusive JavaScript secion in the JavaScript guide
a4c3d5a
@pwnall pwnall Use the MySQL varbinary type when appropriate in migrations. 5d30e44
@rafaelfranca rafaelfranca Merge pull request #7960 from pwnall/mysql_varbinary
Use the MySQL varbinary type when appropriate in migrations
51adec3
@rafaelfranca rafaelfranca USe the released version of sprockets-rails in a new Rails 4 application 2e44dda
@pmahoney pmahoney Replace flow-control exception with explicit test.
It was noticed while profiling 'assets:precompile' in JRuby that
exception creation was consuming a large portion of time, and
some of that was due to File.atomic_write.

Testing first with File.exists? eliminates the need for an exception
which should be a perfomrance improvement on both JRuby and MRI.
In this case, the stat() isn't even extra overhead, since it is always
called.
8d0efcc
@AvnerCohen AvnerCohen Multiple changes to 1,9 hash syntax 62f273b
@johngallagher johngallagher Changed comment section to be more explicit. I had an issue with roll…
…ing back a migration and couldn't understand why 'rake db:reset' didn't work.
c570ba7
@johngallagher johngallagher Merge branch 'master' of https://github.com/lifo/docrails 4edea9e
Commits on Oct 28, 2012
@bashmish bashmish fix typo in button_to helper example 3b76725
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8050 from bashmish/master
fix typo in button_to helper example [ci skip]
66033a9
@carlosantoniodasilva carlosantoniodasilva Add backticks around link_to example in javascript guide [ci skip] f47026e
@carlosantoniodasilva carlosantoniodasilva Add syntax highlight to code blocks in javascript guide [ci skip] 94aadf7
@schneems schneems Don't log on pending migration check
Conversation from: #6665 cc/ @rafaelfranca
0fbdddd
@rafaelfranca rafaelfranca Merge pull request #8052 from schneems/schneems/silence-ar-query-in-m…
…iddleware

Don't log on pending migration check
e46a8d8
@frodsan frodsan AR::AttributeMethods#[] raises AM::AttributeMissingError for missing …
…attributes.

This fixes the following behaviour:

    class Person < ActiveRecord::Base
      belongs_to :company
    end

    # Before:
    person = Person.select('id').first
    person[:name]       # => nil
    person.name         # => ActiveModel::MissingAttributeError: missing_attribute: name
    person[:company_id] # => nil
    person.company      # => nil

    # After:
    person = Person.select('id').first
    person[:name]       # => ActiveModel::MissingAttributeError: missing_attribute: name
    person.name         # => ActiveModel::MissingAttributeError: missing_attribute: name
    person[:company_id] # => ActiveModel::MissingAttributeError: missing_attribute: company_id
    person.company      # => ActiveModel::MissingAttributeError: missing_attribute: company_id

Fixes #5433.
10f6f90
@rafaelfranca rafaelfranca Merge pull request #8056 from frodsan/fix_issue_missing_attribute
AR::AttributeMethods#[] raises AM::AttributeMissingError for missing attributes
c82f0d7
@senny senny refactor `SQLite3Adapter#copy_table` to prevent primary key redefinit…
…ions. #6378
b104157
@senny senny raise `ArgumentError` when redefining the primary key column. Closes #… e4790a2
@senny senny Do not render views when mail() isn't called. (NullMail refactoring) b786f06
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8054 from senny/6378_create_table_raises_when_def…
…ining_pk_column

create_table raises an ArgumentError when the primary key is redefined.
ed80dd7
@carlosantoniodasilva carlosantoniodasilva Fix some assert_raise calls containing messages in Active Support d46f9e3
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8047 from arunagw/json_only_in_18
Removing JSON for other ruby
a698175
@rafaelfranca rafaelfranca Merge pull request #8048 from senny/7761_dont_render_view_without_mai…
…l_call

Do not render views when mail() isn't called. (NullMail refactoring)
a273b6b
@rafaelfranca rafaelfranca Merge pull request #8046 from pmahoney/exceptions_as_flow_control
Replace flow-control exception with explicit test.
5bbe245
@henrik henrik Enable update_column(s) for the primary key attribute.
Didn't work before because it updated the model-in-memory first, so the DB query couldn't find the record.
1849665
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8053 from henrik/update_columns_with_primary_key
Unbreak update_column/update_columns for the primary key attribute.
c6f47c1
@xuanxu xuanxu loaded relations cannot be mutated by extending! 35ca953
@xuanxu xuanxu ActiveRecord::Relation#none! method. 300d080
@rafaelfranca rafaelfranca Merge pull request #7750 from xuanxu/none_modificating_relation_in_place
Added ActiveRecord::Relation#none! method
852e376
@frodsan frodsan dont encourage AC::Parameters#permit_all_parameters usage [ci skip] cd17ee5
Stefan Rusterholz SQLite3Adapter#type_cast should not mutate arguments b5133d0
Commits on Oct 29, 2012
@rafaelfranca rafaelfranca Merge pull request #8057 from frodsan/fix_sqlite_mutate_arg
SQLite3Adapter#type_cast should not mutate arguments
1743e95
@rafaelfranca rafaelfranca Fix the skip code.
Checking for the constant doesn't work
81679ab
Daniele Sluijters atomicc.rb: Don't assume we may chown/chmod a file.
Previously this code just assumed it is capable of changing the file
ownership, both user and group. This will fail in a lot of scenario's
unless:
* The process is run as a superuser (root);
* The owning user and group are already set to the user and group we're
  trying to chown to;
* The user chown'ing only changes the group to another group it is a
  member of.
If either of those conditions are not met the filesystem will simply
deny the operation throwing an error.

It is also not always possible to do a chmod, there might be a SELinux
policy or another limitation preventing the user to change the file
mode. To this end the chmod call has also been added to the rescue
block.

I've also added a little comment above the chmod command that doing a
chmod on a file which has an ACL set will cause the ACL to be
recalculated / modified.
851f8c1
@fxn fxn Merge pull request #8027 from daenney/master
Atomic.rb assumes it may chown/chmod a file but doesn't handle the EPERM error.
71abfa5
@xuanxu xuanxu 3.1 and up, in configuring guide. 0d7dcdc
@xuanxu xuanxu Merge branch 'master' of github.com:lifo/docrails 20c574c
@AvnerCohen AvnerCohen Hash Syntax to 1.9 related changes be4a4cd
@rafaelfranca rafaelfranca Merge pull request #7587 from elia/fix-too-eager-loading
Should not eager_load app/assets
Conflicts:
	railties/CHANGELOG.md
3663057
@rafaelfranca rafaelfranca Add test to deprecation of Path#children 29b1dc2
@carlosantoniodasilva carlosantoniodasilva Fix deprecation message in test for Path#children 72e6fb0
@nikitug nikitug Provide a call stack for deprecation warnings where needed.
It's sometimes hard to quickly find where deprecated call was performed, especially in case of migrating between Rails versions. So this is an attempt to improve the call stack part of the warning message by providing caller explicitly.
0b7067d
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8063 from nikitug/deprecation_caller_context
Provide a call stack for deprecation warnings where needed.
d1c95d9
@carlosantoniodasilva carlosantoniodasilva Fix failing tests and use new hash style in deprecation messages 008154e
@cfabianski cfabianski Add test for code change introduced in this commit f20032f 3152ee8
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8066 from cfabianski/AddTestForSerializationMethod
Add test for code change introduced in this commit f20032f
a4ac2b4
Commits on Oct 30, 2012
@rafaelfranca rafaelfranca Fix bug when Column is trying to type cast boolean values to integer.
This can occur if the user is using :integer columns to store boolean
values. Now we are handling the boolean values but it still raises if
the value can't type cast to integer and is not a boolean. See #7509.

Fixes #8067.

Conflicts:
	activerecord/CHANGELOG.md
3525a9b
@carlosantoniodasilva carlosantoniodasilva Remove not assigned variable warning from sqlite3 adapter test 4e23c0e
@gazay gazay Make caller attribute in deprecation methods optional b955939
@carlosantoniodasilva carlosantoniodasilva Merge pull request #6107 from gazay/make_caller_attribute_in_deprecat…
…ion_optional

Make callstack attribute optional in AS:Deprecation
0ad6c08
@kennyj kennyj include_root_in_json allows inheritance. fcd19a1
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8072 from kennyj/remove_mattr_include_root_in_json
Allow include_root_in_json to be inheritable by using the class_attribute created by Active Model serialization module.
48fe4f1
@spastorino spastorino Revert "The debugger gem isn't compatible with 1.9.3-p286 yet. Omit i…
…t for now."

This reverts commit 7b290ad.
debugger gem is now working ok with p286
e0fb16b
@jonleighton jonleighton Revert "Support `Mailer.deliver_foo(*args)` as a synonym for `Mailer.…
…foo(*args).deliver`."

This reverts commit 7e0cf56.

Conflicts:
	actionmailer/CHANGELOG.md

See discussion at
7e0cf56#commitcomment-2075489
7e17b0b
Commits on Oct 31, 2012
@kennyj kennyj Fix #6951. Use query cache/uncache, when using not only database.yml …
…but also DATABASE_URL.
a7c3c90
@rafaelfranca rafaelfranca Merge pull request #8074 from kennyj/fix_6951
Fix #6951. Use query cache/uncache, when using not only database.yml but also DATABASE_URL.
85039d4
@nikitug nikitug Fix `attributes_before_type_cast` for serialised attributes.
Public method `attributes_before_type_cast` used to return internal AR structure (ActiveRecord::AttributeMethods::Serialization::Attribute), patch fixes this. Now behaves like `read_attribute_before_type_cast` and returns unserialised values.
e7e59a7
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8078 from nikitug/serialized_attributes_before_ty…
…pe_cast

Fix `attributes_before_type_cast` for serialized attributes.
6569709
@acapilleri acapilleri if format is unknown NullMimeTypeObject is returned
If a unknown format is passed in a request, the methods html?, xml?, json? ...etc
Nil Exception.

This patch add a class NullMimeTypeObject, that is returned when  request.format is unknown
and it responds false to the methods that ends with '?'.

It refers to #7837, not fixes because it's not considered a improvement not a bug.
a8560fa
@rafaelfranca rafaelfranca Merge pull request #8084 from acapilleri/format_never_nil
if format is unknown NullMimeTypeObject is returned
6a6909d
Alexis Bernard Fix find_in_batches against string IDs when start option is not speci…
…fied.
a58cafe
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8073 from alexisbernard/fix_find_in_batches_start…
…_option

Fix find_in_batches against string IDs when start option is not specified
92bae49
@carlosantoniodasilva carlosantoniodasilva Remove extre count, preheat already happens during setup 9fdf606
@guilleiguaran guilleiguaran Revert "if format is unknown NullMimeTypeObject is returned"
This reverts commit a8560fa.
4b20cd9
@dhh dhh Allow #permit to take its list of permitted parameters as an array 954c350
@dhh dhh No need for the debugger 750a30b
@dhh dhh Revert "Don't allocate new strings in compiled attribute methods"
This reverts commit f176501.
d349490
@AvnerCohen AvnerCohen 1.9 hash syntax changes to docs d20a529
Commits on Nov 01, 2012
@steveklabnik steveklabnik Make sure that RAILS_ENV is set when accessing Rails.env
Fixes #8025
b3125c8
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8026 from steveklabnik/issue_8025
Make sure that RAILS_ENV is set when accessing Rails.env
1e89e43
@arunagw arunagw Small change to remove warning unused variable. d065938
@spastorino spastorino Merge pull request #8092 from arunagw/warning_removed_unused_var
Small change to remove warning unused variable.
c7e233c
@carlosantoniodasilva carlosantoniodasilva Add test to ensure data attributes are properly escaped with tag helpers
Closes #8091
b31ea0c
@nikitug nikitug Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header, …
…now appends).

Now `BestStandardsSupport` middleware appends it's `X-UA-Compatible` value to app's value.
Also test for `BestStandardsSupport` middleware added.
d8c1404
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8093 from nikitug/keep_app_x_ua_compatible
Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header)
69cebae
@kennyj kennyj This is comment for singular association. 2c4faaa
@carlosantoniodasilva carlosantoniodasilva Fix issue with collection associations and first(n)/last(n)
When calling first(n) or last(n) in a collection, Active Record was
improperly trying to set the inverse of instance in case that option
existed. This change was introduced by
fdf4eae.

In such cases we don't need to do that "manually", since the way
collection will be loaded will already handle that, so we just skip
setting the inverse association when any argument is given to
first(n)/last(n).

The test included ensures that these scenarios will have the inverse of
instance set properly.

Fixes #8087, Closes #8094.

Squashed cherry-pick from d37d40b and c368b66.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/associations/collection_association.rb
694334c
@lest lest memoize calculated ip without additional variable
There is no need in additional `@calculated_ip` instance variable.
43aa2d3
@spastorino spastorino Merge pull request #8019 from lest/patch-1
memoize calculated ip without additional variable
2e20a7d
Commits on Nov 02, 2012
@steveklabnik steveklabnik Fixed timezone mapping of Solomon Islands.
Fixes #8095.

For reference, here is the discussion about the mapping being
incorrect:
http://rubyforge.org/pipermail/tzinfo-users/2012-November/000114.html
642e1af
@rafaelfranca rafaelfranca Merge pull request #8097 from steveklabnik/issue_8095
Fixed mapping of Solomon Islands.
e34d856
@rafaelfranca rafaelfranca Revert "Merge pull request #7668 from Draiken/fix_issue_6497"
This reverts commit f4ad0eb, reversing
changes made to 8b2cbb3.

Conflicts:
	actionpack/CHANGELOG.md

REASON: This added introduced a bug when you have a shorthand route
inside a nested namespace.

See
rafaelfranca@281367e
1bfc5b4
@vijaydev vijaydev Revert "dont encourage AC::Parameters#permit_all_parameters usage [ci…
… skip]"

This reverts commit cd17ee5.

Reason: Let's note that this is discouraged, not remove the docs

[ci skip]
8ffb0da
@vijaydev vijaydev Revert "Updated activerecord test comments to new hash syntax"
This reverts commit 3b89052.

Reason: changes made to a test, albeit in commented lines - non-uniform
change.

[ci skip]
1c3bdfc
@vijaydev vijaydev copy edits [ci skip] ee91749
@rafaelfranca rafaelfranca Add test to avoid regression of 1bfc5b4 974467d
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails
Conflicts:
	actionpack/lib/action_controller/metal/mime_responds.rb
	activerecord/lib/active_record/attribute_methods.rb
	guides/source/working_with_javascript_in_rails.md
3b0bb08
@steveklabnik steveklabnik Fixed grammar in migration pending error. 6831c61
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8106 from steveklabnik/fix_grammar
Fixed grammar in migration pending error.
48a7a26
@rafaelfranca rafaelfranca Raise an ArgumentError when passing an invalid option to add_index
Closes #8104
8fc5270
@spastorino spastorino Clear url helpers when reloading routes 96bcef9
@rafaelfranca rafaelfranca Deprecate passing a string as third argument of `add_index`
This was there due historical reasons since
7dc4581 to give the user the
possibility to create unique indexes passing "UNIQUE" as the third
argument
7042fe2
@rafaelfranca rafaelfranca Remove old comment
This comment is not valid since that `if` is there to make possible to
do:

    remove_index :users, :name

Instead of:

    remove_index :users, column: :name

What is a valid use case.

[ci skip]
743d07e
Daniel Fox, Grant Hutchins & Trace Wax Support :multiple option on input tags with :index
When you have an explicit index set, then when you build an input tag
with :multiple => true, it doesn't add [] to the end of its name, although
it should.
175ba04
@rafaelfranca rafaelfranca Merge pull request #8108 from Casecommons/fix-multiple-and-index-in-i…
…nstance-tag

Support :multiple option on input tags that also have :index
c449462
Commits on Nov 03, 2012
@jonleighton jonleighton Don't allocate new strings in compiled attribute methods
This improves memory and performance without having to use symbols which
present DoS problems. Thanks @headius and @tenderlove for the
suggestion.

This was originally committed in
f176501, and then reverted in
d349490 due to it causing problems in a
real application. This second attempt should solve that.

Benchmark
---------

require 'active_record'
require 'benchmark/ips'

ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')

class Post < ActiveRecord::Base
  connection.create_table :posts, force: true do |t|
    t.string :name
  end
end

post = Post.create name: 'omg'

Benchmark.ips do |r|
  r.report('Post.new')          { Post.new name: 'omg' }
  r.report('post.name')         { post.name }
  r.report('post.name=')        { post.name = 'omg' }
  r.report('Post.find(1).name') { Post.find(1).name }
end

Before
------

Calculating -------------------------------------
            Post.new      1419 i/100ms
           post.name      7538 i/100ms
          post.name=      3024 i/100ms
   Post.find(1).name       243 i/100ms
-------------------------------------------------
            Post.new    20637.6 (±12.7%) i/s -     102168 in   5.039578s
           post.name  1167897.7 (±18.2%) i/s -    5186144 in   4.983077s
          post.name=    64305.6 (±9.6%) i/s -     317520 in   4.998720s
   Post.find(1).name     2678.8 (±10.8%) i/s -      13365 in   5.051265s

After
-----

Calculating -------------------------------------
            Post.new      1431 i/100ms
           post.name      7790 i/100ms
          post.name=      3181 i/100ms
   Post.find(1).name       245 i/100ms
-------------------------------------------------
            Post.new    21308.8 (±12.2%) i/s -     105894 in   5.053879s
           post.name  1534103.8 (±2.1%) i/s -    7634200 in   4.979405s
          post.name=    67441.0 (±7.5%) i/s -     337186 in   5.037871s
   Post.find(1).name     2681.9 (±10.6%) i/s -      13475 in   5.084511s
a89869e