rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \|	Merge pull request #7613 from marcandre/delegate_to_class	Jeremy Kemper	2012-09-20	2	-0/+14
\|\ \ \ \
\| * \| \| \|	Nice and easy delegation to the class	Marc-Andre Lafortune	2012-09-11	2	-0/+14
* \| \| \| \|	Merge pull request #7720 from frodsan/rename_ar_tag	Jon Leighton	2012-09-20	6	-14/+19
\|\ \ \ \ \
\| * \| \| \| \|	rename AR::Model::Tag to AR::Tag - fixes #7714	Francesco Rodriguez	2012-09-20	6	-14/+19
* \| \| \| \| \|	Merge pull request #7719 from frodsan/strong_params_docs_part_two	Rafael Mendonça França	2012-09-20	3	-15/+30
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	add :nodoc: to AMo::DeprecatedMassAssignmentSecurity::ClassMethods [ci skip]	Francesco Rodriguez	2012-09-20	1	-3/+3
\| * \| \| \| \|	change AMo::ForbiddenAttributesProtection#sanitize_for_mass_assignment to pro...	Francesco Rodriguez	2012-09-20	1	-7/+8
\| * \| \| \| \|	update AMo::ForbiddenAttributesError documentation [ci skip]	Francesco Rodriguez	2012-09-20	1	-0/+12
\| * \| \| \| \|	fix typos and improve AC::StrongParameters documentation [ci skip]	Francesco Rodriguez	2012-09-20	1	-6/+8
\| * \| \| \| \|	add :nodoc: directives to AMo::DeprecatedMassAssignmentSecurity [ci skip]	Francesco Rodriguez	2012-09-20	1	-3/+3
\|/ / / / /
* \| \| \| \|	Remove the environment variables in the Gemfile	Rafael Mendonça França	2012-09-20	1	-27/+7
* \| \| \| \|	Freeze columns only once per Result	Santiago Pastorino	2012-09-20	1	-6/+9
* \| \| \| \|	Merge pull request #7703 from kennyj/fix_6962	Rafael Mendonça França	2012-09-20	2	-1/+12
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z for...	kennyj	2012-09-20	2	-1/+12
* \| \| \| \|	Freeze columns just before using them as hash keys	Santiago Pastorino	2012-09-20	1	-2/+5
* \| \| \| \|	Merge pull request #7631 from jeremyevans/patch-1	Aaron Patterson	2012-09-19	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Freeze columns before using them as hash keys	Jeremy Evans	2012-09-13	1	-1/+1
* \| \| \| \| \|	Merge pull request #7702 from guilleiguaran/remove-manifest-option	Santiago Pastorino	2012-09-19	5	-13/+11
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Allow to use a local copy of sprockets-rails during development	Guillermo Iguaran	2012-09-19	1	-1/+6
\| * \| \| \| \| \|	Remove highly uncommon `config.assets.manifest` option for moving the manifes...	Guillermo Iguaran	2012-09-19	4	-12/+5
* \| \| \| \| \| \|	Merge pull request #7692 from frodsan/strong_params_docs	Santiago Pastorino	2012-09-19	3	-14/+225
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	update AC::StrongParameters documentation	Francesco Rodriguez	2012-09-19	1	-8/+53
\| * \| \| \| \| \| \|	define permitted? method instead of use an alias to fix rdoc	Francesco Rodriguez	2012-09-19	1	-2/+12
\| * \| \| \| \| \| \|	update AC::Parameters documentation [ci skip]	Francesco Rodriguez	2012-09-19	1	-1/+149
\| * \| \| \| \| \| \|	update AC::ParameterMissing documentation [ci skip]	Francesco Rodriguez	2012-09-19	1	-2/+9
\| * \| \| \| \| \| \|	update AR::AttributeAssignment documentation [ci skip]	Francesco Rodriguez	2012-09-19	1	-5/+5
\| * \| \| \| \| \| \|	update AC::ParamsWrapper documentation [ci skip]	Francesco Rodriguez	2012-09-19	1	-3/+4
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #7710 from guilleiguaran/refactor-ar-attributes-method	Rafael Mendonça França	2012-09-19	1	-10/+4
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	AR::Base#attributes= is just an alias for AR::Base#assign_attributes	Guillermo Iguaran	2012-09-19	1	-10/+4
* \| \| \| \| \| \| \|	Merge pull request #7709 from alexreisner/master	Rafael Mendonça França	2012-09-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix out-of-date URL.	Alex Reisner	2012-09-19	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #7707 from guilleiguaran/changelogs-update	Rafael Mendonça França	2012-09-19	4	-0/+50
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Update changelogs to add entries about strong_parameters integration	Guillermo Iguaran	2012-09-19	4	-0/+50
\|/ / / / / / /
* \| \| \| \| \| \|	extracts manual development dependencies installation to a new non-promoted g...	Xavier Noria	2012-09-20	2	-158/+176
* \| \| \| \| \| \|	Load the environment after creating the database	Jeremy Kemper	2012-09-19	1	-2/+2
* \| \| \| \| \| \|	Revert "Make sure :environment task is executed before db:schema:load or db:s...	Jeremy Kemper	2012-09-19	1	-2/+2
* \| \| \| \| \| \|	Merge pull request #7701 from guilleiguaran/set-permit-all-parameters-explicitly	Rafael Mendonça França	2012-09-19	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Set AC::Parameters.permit_all_parameters explicitly to false when config.acti...	Guillermo Iguaran	2012-09-19	1	-1/+1
* \| \| \| \| \| \| \|	Improve the CHANGELOG entry for #6971	Rafael Mendonça França	2012-09-19	1	-1/+14
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #6971 from dmathieu/empty_hash	Rafael Mendonça França	2012-09-19	3	-3/+18
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	fix querying with an empty hash	Damien Mathieu	2012-09-19	3	-3/+18
* \| \| \| \| \| \|	Merge pull request #7482 from route/syncing_tests_for_sprockets	Rafael Mendonça França	2012-09-19	2	-33/+37
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Since in sprockets-rails uglifier's version doesn't matter do the same in rails	Dmitry Vorotilin	2012-09-19	1	-1/+1
\| * \| \| \| \| \|	Use last version of sprockets-rails and syncing tests for assets.	Dmitry Vorotilin	2012-09-19	2	-32/+36
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #7668 from Draiken/fix_issue_6497	Rafael Mendonça França	2012-09-19	3	-3/+20
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Removing to_shorthand from default_controller_and_action. Fixes #6497	Luiz Felipe	2012-09-19	3	-3/+20
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #7697 from guilleiguaran/minor-ar-cleanups	Carlos Antonio da Silva	2012-09-19	1	-5/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Remove unused private method AR::NestedAttributes#unassignable_keys and refer...	Guillermo Iguaran	2012-09-19	1	-5/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #7694 from guilleiguaran/update-ar-docs	Rafael Mendonça França	2012-09-18	2	-21/+1
\|\ \ \ \ \
\| * \| \| \| \|	Update AR::Base.create and AR:Base#update_attributes docs to remove reference...	Guillermo Iguaran	2012-09-18	1	-11/+0