Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

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

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rails/rails
...
head fork: rails/rails
This comparison is big! We're only showing the most recent 250 commits
Commits on Nov 08, 2011
@rahul100885 rahul100885 Updated Rakefile as CHANGELOG has been renamed to CHANGELOG.md 8e56866
@vijaydev vijaydev Merge pull request #3562 from rahul100885/rahul100885_work
Updated Rakefile as CHANGELOG has been renamed to CHANGELOG.md
5b21bfa
@amatsuda amatsuda exclude ORDER BY clause when querying Relation#exists? 74c6e80
@tenderlove tenderlove Merge pull request #3572 from amatsuda/ar_exists_uniq_order
exclude ORDER BY clause when querying Relation#exists?
6e87281
Commits on Nov 09, 2011
@arunagw arunagw Refactor test:uncommitted task.
Thanks to @sobrinho (Gabriel Sobrinho)
5f826ea
@vijaydev vijaydev Merge pull request #3574 from arunagw/refactor_testing_uncommitted_task
Refactor test:uncommitted task.
2843d3b
@arunagw arunagw CHANGELOG => CHANGELOG.md
I missed these in previous commit
f642724
@vijaydev vijaydev Merge pull request #3579 from arunagw/missing_md_in_changelog
CHANGELOG => CHANGELOG.md
fba28ec
@amatsuda amatsuda Modulize Rails console methods so that other console libraries such a…
…s Pry can include these methods
6d09f27
@josevalim josevalim Merge pull request #3509 from amatsuda/console_extend_command_bundle
move Rails console top level methods to IRB context
4857339
@josevalim josevalim Use head :no_content on the guides as well. f686d94
@amatsuda amatsuda Extend IRB right before starting IRB to remove dependency on IRB from…
… Rails::Application
a658fd2
@josevalim josevalim Merge pull request #3589 from amatsuda/console_extend_command_bundle_fix
Extend IRB right before starting IRB to remove dependency on IRB from Rails::Application
4c59170
@josevalim josevalim Deprecated ActiveSupport::MessageEncryptor#encrypt and decrypt. 71e84a3
@josevalim josevalim Don't marshal dump twice when using encryptor. a625523
Commits on Nov 10, 2011
@amatsuda amatsuda A test case to ensure that AC::Metal#response_body= always wraps the …
…given value in an Array in both Ruby 1.8 and 1.9 (refs #3581)
be7ab83
@avakhov avakhov Cosmetic fix in number_to_currency docs 983a2dc
@tylercoville tylercoville Fixed error with 'rails generate new plugin' where the .gitignore was…
… not properly generated if --dummy-path was used and added test case
4934908
@avakhov avakhov Fix and simplify highlight regexp b5c3987
@bogdan bogdan AS::Callbacks#_define_runner refactored
Incapsulate the logic of keyed callback method definition and execution
in the separated method.
bf6e29e
@josevalim josevalim Merge pull request #3581 from amatsuda/metal_response_body_19
AC::Metal#response_body= stores different value in Ruby 1.8 and 1.9
d2cfa98
@josevalim josevalim Merge pull request #3593 from bogdan/callbacks
AS::Callbacks._define_runner better abstraction
c778f4e
@josevalim josevalim Merge pull request #3591 from tylercoville/fix-plugin-new
Fixed error with 'rails generate new plugin' where the .gitignore was not
909e5cc
@josevalim josevalim Merge pull request #3592 from avakhov/av-highlight-regexp
Fix and simplify highlight regexp
bdd76fb
@josevalim josevalim self.class.name -> self.name (we are already inside a class). 80f96eb
@bogdan bogdan AS::Callbacks.__run_keyed_callback: remove unused cache 08cc49b
@vijaydev vijaydev Fixes deprecation warning about passing a template handler
in the template name while generating guide related pages
like index, layout and credits
74233d4
@vijaydev vijaydev Checking the arity of the block passed to create_table
A recent change made to create_table does away with the
need for the block argument. Checking the arity will prevent the
mixing up of the two syntaxes.
b805c71
@josevalim josevalim Merge pull request #3600 from vijaydev/migration_arity
Checking the arity of the block passed to create_table
23101de
@byroot byroot Fix a tiny typo in custom validators documentation fd17ffc
@morgoth morgoth fixed example code indentation 9ce5d51
@vijaydev vijaydev update ci file name in contributing guide b9aaa31
@vijaydev vijaydev Modify change_table to remove the need for the block argument. 6e112e4
@josevalim josevalim Merge pull request #3603 from vijaydev/change_table_without_block_arg
Modify change_table to remove the need for the block argument
81fad6a
Commits on Nov 11, 2011
@vijaydev vijaydev change_table bulk test case should check if the connection supports b…
…ulk alter
2e5c471
@chuyeow chuyeow Fix "in memory" where it should be "in-memory". e34e4d4
@chuyeow chuyeow Update Memcached website to its new one at http://memcached.org/. df5c9fd
@josevalim josevalim Merge pull request #3607 from bogdan/callbacks
AS::Callbacks.__run_keyed_callback: remove unused cache
7352efa
@noefroidevaux noefroidevaux Prevent multiple SHOW TABLES calls when a table don't exists in datab…
…ase.
27c5800
@tenderlove tenderlove Merge pull request #3609 from noefroidevaux/issue_3595
Prevent multiple SHOW TABLES calls when a table don't exists in database...
1c6d6b6
@vijaydev vijaydev Revert "Fix "in memory" where it should be "in-memory"."
This reverts commit e34e4d4.

Reason: code changes are not allowed in docrails.
9fd0cd3
@bogdan bogdan AS::Callbacks::Callback#_compile_option refactored 8483c7c
@josevalim josevalim Merge pull request #3611 from bogdan/compile_options
AS::Callbacks::Callback#_compile_option refactored
b7052a0
@mitio mitio Fix wording and minor typos in the Responder RDoc a766d83
@fxn fxn Merge pull request #3613 from mitio/fix-actionpack-responder-docs
Fix wording and minor typos in the Responder RDoc
c3035e1
@sikachu sikachu For what it's worth; Update `memcache-client` gem name 84908fa
Commits on Nov 12, 2011
@indirect indirect refactor RemoteIp middleware
- return the last forwarded IP before REMOTE_ADDR to handle proxies
- remove completely superfluous RemoteIpGetter class
- remove duplication of trusted proxies regexp
- remove unused constant from Request
- move comments from Request to where they are actually relevant
- edit comments for clarity of purpose

The original code (confusingly) tried to return REMOTE_ADDR both at the beginning and the end of the chain of options. Since REMOTE_ADDR is _always_ set, this is kind of silly. This change leaves REMOTE_ADDR as the last option, so that proxied requests will be assigned the correct remote IP address.
9432163
@indirect indirect defer calculating the remote IP until requested 317f4e2
@amatsuda amatsuda Unneeded require memoizable b74aedf
@jonleighton jonleighton Merge pull request #3618 from amatsuda/ad_headers_unmemoizable
Unneeded require 'active_support/memoizable'
8f20d59
@spastorino spastorino Allow to use ruby-debug in 1.9.3 df300a7
Commits on Nov 13, 2011
@chuyeow chuyeow Fix "in memory" where it should be "in-memory". a02b40a
@chuyeow chuyeow Suggest a workaround for page caching and parameters instead of an un…
…helpful warning.
650ec89
@chuyeow chuyeow Clearing cache in action caching is not "the exact same way" as with …
…page caching.
d9703fe
@chuyeow chuyeow Fix bad English. f323b42
@jasonnoble jasonnoble Add Tip about skipping to Section 3 if they want to come back to the …
…philosophy later
962c55d
@jasonnoble jasonnoble Move paragraphs to flow better
- Give the user a way to know they are fully installed and ready to continue
ee10012
@jasonnoble jasonnoble Use rails help new instead of rails new -h 6ac65c9
@jasonnoble jasonnoble Updated wording on what 'rails new blog' did for the user
- Alphabetized the files/folders created
- Added link to Configuring Rails Applications
b778a7e
@jasonnoble jasonnoble Updated wording to read better 194a42e
@jasonnoble jasonnoble Move Tip up higher so users who are fine with SQLite can skip to the …
…next section
4bf057b
@jasonnoble jasonnoble Fix typo 703d5c2
@jasonnoble jasonnoble Update wording to flow better 434fbe4
@jasonnoble jasonnoble Update order so they show up in the order they do in the scaffolding …
…output
094bb8e
@jasonnoble jasonnoble Update wording to be more explicit on what the timestamp fields track 06a8d16
@jasonnoble jasonnoble Update wording to read better 1394c54
@jasonnoble jasonnoble Add link to AR Validations and Callbacks to further explain validations fc8f0a8
@jasonnoble jasonnoble p.errors.full_messages is a little more human readable cb552f8
@jasonnoble jasonnoble Be explicit about changing code 9b96f74
@jasonnoble jasonnoble Make the guide more friendly
- Changed Rails 3.0 to 3.0+
3e3872b
@jasonnoble jasonnoble Be explicit on where the show.html.erb is located 5e83491
@noefroidevaux noefroidevaux Fix pull request #3609 bf6efa8
@jasonnoble jasonnoble Grammar change c0ee497
@jasonnoble jasonnoble Convert tables to table format 0774f22
@jasonnoble jasonnoble Add output for add_index command a3156ac
@jasonnoble jasonnoble Update guide to use Ruby 1.9 hash syntax 50a9de5
@josevalim josevalim Merge pull request #3617 from indirect/remote_ip
refactor RemoteIp middleware
2591cc6
@vijaydev vijaydev Revert "Update guide to use Ruby 1.9 hash syntax"
This reverts commit 50a9de5.

Reason: Let's keep the guides at 1.8 syntax
e1099eb
@vijaydev vijaydev Revert "Use rails help new instead of rails new -h"
This reverts commit 6ac65c9.
c8c08bd
@vijaydev vijaydev Revert "Move Tip up higher so users who are fine with SQLite can skip…
… to the next section"

This reverts commit 4bf057b.

Reason: Prefer to keep the configuration of all databases at the same
level
af51409
@vijaydev vijaydev copy edits in getting started guide 3012230
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails e0efe48
@jasonnoble jasonnoble Move tooltip on re-running rails new with a different --database option 8971cca
@indirect indirect change tests to expect X-F-F over REMOTE_ADDR 8f0085a
@indirect indirect correctly raise IpSpoofAttackError message 2189bff
@indirect indirect turns out the tests expect remote_addrs.first 2d063c6
@indirect indirect remove ignored flag, fixes warnings 9c4532b
@josevalim josevalim Merge pull request #3623 from indirect/remote_ip
Remote IP fixes/cleanup
d37e169
@wycats wycats Merge pull request #3622 from noefroidevaux/issue_3595
Fix pull request #3609
2ec8d52
Commits on Nov 14, 2011
@guilleiguaran guilleiguaran Upgrade Sprockets to 2.1.0
This version brings bug fixes for performance and caching.
e0eb229
@jonleighton jonleighton Sync CHANGELOGs from 3-1-stable da02f79
@jonleighton jonleighton Add note about syncing CHANGELOGs c7b8468
@jonleighton jonleighton Merge pull request #3625 from guilleiguaran/sprockets-2.1.0
Upgrade Sprockets to 2.1.0
d023078
@guilleiguaran guilleiguaran Added therubyrhino to default Gemfile under JRuby 49cd6a0
@jonleighton jonleighton Add note about checking postgres tests before release 4d8081b
@jonleighton jonleighton Sync changelog entry ca3b468
@tenderlove tenderlove Merge pull request #3371 from yahonda/fix_ora_00932_error
Fix ORA-00932 error when trying to insert 0 to DATE type columns.
11c9fc9
@oscardelben oscardelben use any? instead of !empty? af64ac4
@jonleighton jonleighton rake release should push the tag 156784f
@jonleighton jonleighton Add a note to REALEASING_RAILS about testing the gem locally before r…
…eleasing
be777b3
@wycats wycats Merge pull request #3628 from oscardelben/refactoring
use any? instead of !empty?
1df22bb
@josevalim josevalim Merge pull request #3626 from guilleiguaran/include-therubyrhino-gemfile
Added therubyrhino to default Gemfile under JRuby
2088f1b
@josevalim josevalim Speed up attribute invocation by checking if both name and calls are …
…compilable.
9fa329b
@indirect indirect cleaner names 00a0a4d
@indirect indirect memoize the relatively expensive remote IP code cda1a5d
@indirect indirect Return the calculated remote_ip or ip
This was an especially nasty bug introduced in 317f4e2, by the way that an instance of GetIp is not nil, but GetIp#to_s could sometimes return nil. Gross, huh?
4f2bf64
@josevalim josevalim Merge pull request #3631 from indirect/remote_ip
Force calculation of remote IP before using || operator
25c9e44
@indirect indirect add test for bug fixed in 4f2bf64 b8c85de
@jonleighton jonleighton Merge pull request #3632 from indirect/b8c85de
unit test for fix from a few minutes ago
c7ab43f
Commits on Nov 15, 2011
@indirect indirect GetIp#to_s should never return nil. That's icky. d743954
@sobrinho sobrinho Failing test case for issue #3483 e1b79c5
@RyanNaughton RyanNaughton Fixes issue #3483, regarding using a mixture of ranges and discrete v…
…alues in find conditions. Paired with Joey Schoblaska.
63a22ca
@arunagw arunagw Unused variable removed 76b6027
@HeeL HeeL made url to a github issues a bit shorter - no need in a page param w…
…hen it's a first page
df08273
@vijaydev vijaydev refactor test_multiple_of 83bf0b6
@wycats wycats Merge pull request #3640 from indirect/remote_ip
GetIp#to_s should never return nil. That's icky.
6491aad
@jonleighton jonleighton Revert "Merge pull request #3640 from indirect/remote_ip"
This reverts commit 6491aad, reversing
changes made to 83bf0b6.

See #3640 (comment) for
explanation.
8d1a2b3
Commits on Nov 16, 2011
rpq added comma bc00514
@tenderlove tenderlove Merge pull request #3634 from RyanNaughton/fixes_3483
Fixes 3483
9364043
@dyba dyba Changed Commands module to RailsCommands.
This is to avoid a conflict that occurs when you add Rake to
your Gemfile. There is a Commands Object in Rake that conflicts
with the Commands module in plugin.rb. See rails issue #1866.
21c5a0a
@dyba dyba Substituted RailsCommands for Rails::Commands 325abe9
@tenderlove tenderlove bundler treats trunk ruby as ruby 1.9, hack around that for now df5ec41
@tenderlove tenderlove fixing tests on PG 61228e9
@jonleighton jonleighton Switch from marshal format to plain text for the encoding conversions…
… dump. This is for windows compatibility. Fixes #3644.
3a6a10a
@tenderlove tenderlove Merge pull request #2948 from atambo/master
schema_format :sql should behave like schema_format :ruby
43821bf
@tenderlove tenderlove removing some useless conditionals cef1e14
@indirect indirect Revert "Revert "Merge pull request #3640 from indirect/remote_ip""
This reverts commit 8d1a2b3, because I have fixed the issues this commit caused in the next commit.
f05ccf8
@indirect indirect :facepalm: Request#remote_ip has to work without the middleware 5621abd
@jonleighton jonleighton Merge pull request #3608 from arunagw/unused_var_remove
Unused variable removed
a152fd3
@indirect indirect the object itself isn't the IP, #to_s is the IP a9044d0
@lazyatom lazyatom `ActiveRecord::Base#becomes` should retain the errors of the original…
… object.

This commit contains a simple failing test that demonstrates the behaviour we expect, and a fix. When using `becomes` to transform the type of an object, it should retain any error information that was present on the original instance.
73cb0f9
@jonleighton jonleighton Merge pull request #3438 from lazyatom/becomes-includes-errors
Becomes includes errors
540e929
@jonleighton jonleighton Merge pull request #3500 from olivierlacan/error-whitespace
CSS fix to prevent error output from being breaking out of body element.
272f2b7
@tenderlove tenderlove Move conditionals to separate tasks so they can be reused. 38d26b0
@tenderlove tenderlove Reduce schema format tests ca69408
@tenderlove tenderlove dbfile isn't supported anymore, so remove b96aaf8
@tenderlove tenderlove Join method uses empty string by default, so remove it 97ca635
@tenderlove tenderlove Adding a deprecation warning for use of the schema_info table. bb95e81
capps "denoted" instead of "donated"
"parentheses" instead of "use brackets"
64a3175
Commits on Nov 17, 2011
@tenderlove tenderlove No need to `readlines` then `join`, just use `read` :heart: 4c1a193
@tenderlove tenderlove Merge pull request #3649 from indirect/remote_ip
Fixes for Request#remote_ip (no middleware, all proxies)
70f9b74
@tenderlove tenderlove Initialize our instance variables. e367142
@wildchild wildchild Fix impractical I18n lookup in nested fields_for c2b6f63
@arunagw arunagw No need to `readlines` then `join`, just use `read` :heart:
same as 4c1a193
5ccd9bc
@vijaydev vijaydev Merge pull request #3656 from arunagw/readline_to_read
No need to `readlines` then `join`, just use `read` :heart:
4148a7c
@arunagw arunagw It should be @calculated_ip not @calculate_ip
We are using @calculated_ip. 
@calculate_ip is no where used
c3ae1d2
@vijaydev vijaydev Merge pull request #3658 from arunagw/fix_initialize_var_name
It should be @calculated_ip not @calculate_ip
e6f3299
@josevalim josevalim Merge pull request #3654 from wildchild/label_i18n
Fix impractical I18n lookup in nested fields_for
e2d3060
@atambo atambo Move schema_format :sql config setting from test.rb to application.rb
I've moved the schema_format :sql config setting to application.rb because you would
never enable this only for the test environment. If you use database constraints
or database specific data types you would want all of your environments to use them.
0af9308
@josevalim josevalim Merge pull request #3663 from atambo/master
Move schema_format :sql config setting from test.rb to application.rb
d8b2b6a
@sunny sunny Guides: better example to find the last sent email 8d17af2
@oscardelben oscardelben Cleanup of databases.rake psql env variables a89fabb
@tenderlove tenderlove Revert "Merge pull request #3603 from vijaydev/change_table_without_b…
…lock_arg"

This reverts commit 81fad6a, reversing
changes made to 23101de.

Conflicts:

	activerecord/test/cases/migration_test.rb
649f251
@tenderlove tenderlove Revert "Merge pull request #1163 from amatsuda/sexier_migration_31"
This reverts commit 0e407a9, reversing
changes made to 533a9f8.

Conflicts:

	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
	activerecord/test/cases/migration_test.rb
a2f14e2
@vijaydev vijaydev update guide: db:structure:dump produces structure.sql now 9b53406
@gregolsen gregolsen updating API docstring so that user can infer default value 8d83e33
@parndt parndt Fixed typo: expect -> expected e375970
@fxn fxn warn the user values are directly interpolated into _html translation…
… strings
d57d809
@tenderlove tenderlove allow people to set a local .Gemfile so that things like ruby-debug a…
…re not required for regular development
a437986
@fxn fxn Revert "warn the user values are directly interpolated into _html tra…
…nslation strings"

Reason: After another round of discussion, it has been
decided to let interpolation deal with unsafe strings
as it should do.

This reverts commit d57d809.
1079724
@lest lest _html translation should escape interpolated arguments e8d57f3
Commits on Nov 18, 2011
@nilbus nilbus Fix a number_with_delimiter :separator example fe88745
@vijaydev vijaydev Merge pull request #3669 from parndt/patch-1
Fixed typo: expect -> expected
96792d2
@parndt parndt Fixed typo: expect -> expected bc9b1e0
@fxn fxn release instructions: new section about docs generation 307fc12
@vijaydev vijaydev Merge pull request #3666 from oscardelben/databases_rake_cleanup
Cleanup of databases.rake psql env variables
1c4564b
@rubys rubys Stop db:seed from performing a reload of the db
Fix regression introduced by 38d26b0
42954c4
@jonleighton jonleighton Merge pull request #3680 from rubys/master
This fix causes the AWDwR test to go back to being green on Rails master.
d4119e1
@sikachu sikachu Update variable's name in the test case to reflect the class we're te…
…sting
0e2156d
@christos christos Only used detailed schema introspection when doing a schema dump.
Fixes #3678
280b2b7
@vijaydev vijaydev Merge pull request #3681 from sikachu/fix_test_variable
Update variable's name in the test case to reflect the class we're testing
581ba1d
@tenderlove tenderlove Merge pull request #3683 from christos/schema_introspection_speedup
Only used detailed schema introspection when doing a schema dump.
2debbe1
@vijaydev vijaydev put back the removed eg 5a2db4c
@vijaydev vijaydev remove unneeded params from issue tracker url 9d03529
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails 48b580a
@vijaydev vijaydev mailer guide - update info about using default host. Fixes #3642 dda6787
@tenderlove tenderlove some refactoring of the match method 76780c3
@tenderlove tenderlove breaking match down to smaller methods 494ab25
@tenderlove tenderlove pushing hash validation up 7459ba4
@tenderlove tenderlove move constants to methods since nothing else is using them 648f611
@tenderlove tenderlove stop doing is_a? checks on the resource type 33543ac
@tenderlove tenderlove cleaning up variable names to match method parameter names 636405d
@tenderlove tenderlove no need for type checking ecbae99
@tenderlove tenderlove copy options keys to the right place so that undo will work correctly 3178cc9
@tenderlove tenderlove require that all blocks have arity of 2 4589b24
@tenderlove tenderlove arity check has been pushed up, so no need for proc wrapping 163b645
@tenderlove tenderlove make sure to require the right deprecation warning file a8a4264
@tenderlove tenderlove remove the :path feature to redirects, since it cannot work 0809c67
@tenderlove tenderlove moving redirection to objects d34efdd
@tenderlove tenderlove Refactoring the redirect method for the router api. 99d94f1
@tenderlove tenderlove Revert "make sure to require the right deprecation warning file"
This reverts commit 9d725e3df502a07222f35576108eb2df2bd88259.
396ef44
@kennyj kennyj Use `show index from`. We could fix `pk_and_sequence_for` method's pe…
…rformance problem (GH #3678)
f9b9179
Commits on Nov 19, 2011
@arunagw arunagw Warning removed for shadowing variable d806ea2
@wycats wycats Merge pull request #3689 from arunagw/warning_removed_actionpack
Warning removed for shadowing variable
89bbb6c
@jonleighton jonleighton Verify that #3690 has been closed by previous changes to the mysql
adapters.

These tests fail on the v3.1.2 tag.

Closes #3690.
9c37416
@jonleighton jonleighton Merge pull request #3687 from kennyj/fix_3678-2
Use `show index from`. We could fix `pk_and_sequence_for` method's performance problem (GH #3678)
11afb74
@tobiassvn tobiassvn Meaningful errors for unexpected partial arguments. Fixes #3573 771635e
@jonleighton jonleighton Bump sprockets to 2.1.1 86b5e81
@jonleighton jonleighton Don't html-escape the :count option to translate if it's a Numeric. F…
…ixes #3685.
603a679
@jonleighton jonleighton Add missing CHANGELOG entry for #3678. Closes #3678. 2ef4947
@jonleighton jonleighton Perf fix
If we're deleting all records in an association, don't add a IN(..)
clause to the query.

Fixes #3672.
fec85cf
@wycats wycats Merge pull request #3695 from tobiassvn/partial_path_error
Meaningful errors for unexpected partial arguments. Fixes #3573
bc04455
@lest lest fix rails plugin new CamelCasedName bug
refs #3684
39d2251
@lest lest fix warning about instance variable in plugin generator c220b4d
@josevalim josevalim Merge pull request #3696 from lest/fix-plugin-generator
fix rails plugin new CamelCasedName bug
43158e5
@spastorino spastorino Merge pull request #3668 from gregolsen/api_docstring_fix
updating API docstring so that user can infer default value
4cdd44e
Commits on Nov 20, 2011
@tenderlove tenderlove pushing caching and visitors down to the connection bd2f5c0
@tenderlove tenderlove adding visitors to the respective adapters 24fa524
@tenderlove tenderlove Revert "copy options keys to the right place so that undo will work c…
…orrectly"

This reverts commit 3178cc9.
3d2bd69
@tenderlove tenderlove removing deprecated methods 599d7c4
@arunagw arunagw Bump Arel be9d3a2
@tenderlove tenderlove Merge pull request #3701 from arunagw/arel_bump
Bump Arel
26c542b
@tenderlove tenderlove fixing tests on ruby 1.8 008abd1
@tenderlove tenderlove oops! I suck! :bomb: 5d704fa
Commits on Nov 21, 2011
@vijaydev vijaydev Remove the -h option to dbconsole which is the shorter form of --header
This is done since the -h option to dbconsole hides the conventional
-h for help and forces users to use --help to see the usage options for
dbconsole.
4c872c0
@fxn fxn a couple of spurious spaces I saw in passing 60e3e21
@fxn fxn adds a comment to clarify an edge case 91678a5
@fxn fxn cache entry: options[:compressed] is a regular flag, no need for !! f355477
@fxn fxn tests predicates according to the boolean interpretation of their ret…
…urn value, not expecting specifically true or false
a539a5e
@fxn fxn Revert "tests predicates according to the boolean interpretation of t…
…heir return value, not expecting specifically true or false"

Reason: there were some genuine tests for false when
reading values, going to revise those ones.

This reverts commit a539a5e.
f312e21
@josevalim josevalim Deprecate InstanceMethods namespace handling in ActiveSupport::Concern.
This avoids the unnecessary "yo dawg, I heard you like include, so I put a module that includes your module when it is included" approach when building extensions.
401393b
@fxn fxn tests predicates according to the boolean interpretation of their ret…
…urn value, not expecting specifically true or false

Respecting Genuine assert_equal false Edition
8f57bf2
Commits on Nov 22, 2011
@lest lest add ActionController::Metal#show_detailed_exceptions? a9e8cf7
@lest lest refactor show exceptions tests c6d6b28
@lest lest move show_detailed_exceptions? to Rescue module 5bcd119
@vijaydev vijaydev remove nodoc on OrderedHash 8cae31c
@lest lest javascript_include_tag should add '.js' to sources that contain '.' aa491f6
@lest lest deprecation warning, changelog entry 3a1d519
@josevalim josevalim Merge pull request #3717 from lest/show-exceptions-refactor
Show exceptions refactor: controller should be responsible for choice to show exceptions
39ecbfd
@josevalim josevalim Merge pull request #3718 from lest/fix-javascript-include-tag
javascript_include_tag should add '.js' to sources that contain '.'
b13b49c
@marcandre marcandre Make explicit the default media when calling stylesheet_tag and chang…
…e the default generators.
05e02de
@marcandre marcandre Fix inconsistencies with Time{WithZone}#{hash,eql?} a491207
@wycats wycats Merge pull request #3724 from marcandre/media_default
stylesheet_tag default's media is "screen"
9b7be78
@wycats wycats Merge pull request #3725 from marcandre/twz_eql
Fix inconsistencies with Time{WithZone}#{hash,eql?}
a93ee92
Commits on Nov 23, 2011
@kennyj kennyj Remove unreachable code, and add additional testcases. ea70e02
@exviva exviva Fix #3737 AS::expand_cache_key generates wrong key in certain situations
`cache_key` method is never called when the argument is a 1-element array
with something that responds to `cache_key`
d8e6dc9
@exviva exviva Fix #3737 AS::expand_cache_key generates wrong key in certain situati…
…ons (part 2)

`nil` and `false` both expand to `""` (empty string), while `true` expands to
`"true"`; `false` should expand to `"false"`
a650dd0
@josevalim josevalim Merge pull request #3735 from kennyj/fix_3728
Fix #3728 Remove unreachable code, and add additional testcases.
f62f545
@josevalim josevalim Merge pull request #3738 from exviva/issues/3737_AS_cache_expand_cach…
…e_key

Issues/3737 AS::Cache.expand_cache_key
2c568f1
@josevalim josevalim Optimize cache expansion by skipping rails cache id in nested keys. 3ee0116
@josevalim josevalim Rely on a public contract between railties instead of accessing railt…
…ie methods directly.
fd86a1b
@josevalim josevalim Merge branch 'master' into serializers e62de52
@josevalim josevalim Add safe_constantize to ActiveSupport::Dependencies. 0536ea8
@josevalim josevalim Implement ArraySerializer and move old serialization API to a new nam…
…espace.

The following constants were renamed:

  ActiveModel::Serialization     => ActiveModel::Serializable
  ActiveModel::Serializers::JSON => ActiveModel::Serializable::JSON
  ActiveModel::Serializers::Xml  => ActiveModel::Serializable::XML

The main motivation for such a change is that `ActiveModel::Serializers::JSON`
was not actually a serializer, but a module that when included allows the target to be serializable to JSON.

With such changes, we were able to clean up the namespace to add true serializers as the ArraySerializer.
8896b4f
@josevalim josevalim Remove listings from the serialization guide that won't make 3.2. 6da52c6
@josevalim josevalim Rely solely on active_model_serializer and remove the fancy constant …
…lookup.
7fcc8c0
@josevalim josevalim Rename UserSerializer to DefaultUserSerializer in tests. 28bcda4
Commits on Nov 25, 2011
@josevalim josevalim Add generators for serializers. ebb8ea2
@josevalim josevalim Add a hook for serializers in the scaffold generator (off for now). 6d9f9b3
@josevalim josevalim Add docs to serializers. Update CHANGELOGs. 696d01f