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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Revert "Merge pull request #9660 from ↵	Guillermo Iguaran	2013-11-02	5	-57/+11
\| \| \| \| \| \| \| \| \|	sebasoga/change_strong_parameters_require_behaviour" This reverts commit c2b5a8e61ba0f35015e6ac949a5c8fce2042a1f2, reversing changes made to 1918b12c0429caec2a6134ac5e5b42ade103fe90. See: https://github.com/rails/rails/pull/9660#issuecomment-27627493
*	Added ActiveRecord::Base#enum for declaring enum attributes where the values ↵	David Heinemeier Hansson	2013-11-02	7	-2/+128
\| \| \| \|	map to integers in the database, but can be queried by name
*	Merge pull request #12686 from kryzhovnik/master	Carlos Antonio da Silva	2013-11-02	1	-6/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Minor doc fix of ActiveModel::Naming. [ci skip] Conflicts: activemodel/lib/active_model/naming.rb
\| *	Minor doc fix of ActiveModel::Naming.	Andrey Samsonov	2013-10-29	1	-6/+6
\| \| \| \| \| \| \| \| \| \|	- qoute example line's result when it kind of String - right ("singular_route_key") method in example
* \|	Merge pull request #9660 from ↵	Guillermo Iguaran	2013-11-01	5	-11/+57
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	sebasoga/change_strong_parameters_require_behaviour Change ActionController::Parameters#require behavior when value is empty
\| * \|	Change ActionController::Parameters#require behavior when value is empty	Sebastian Sogamoso	2013-03-11	5	-11/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When the value for the required key is empty an ActionController::ParameterMissing is raised which gets caught by ActionController::Base and turned into a 400 Bad Request reply with a message in the body saying the key is missing, which is misleading. With these changes, ActionController::EmptyParameter will be raised which ActionController::Base will catch and turn into a 400 Bad Request reply with a message in the body saying the key value is empty.
* \| \|	Fix wrong behavior where associations with dependent: :destroy options	Rafael Mendonça França	2013-11-01	3	-10/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	was using nullify strategy This caused a regression in applications trying to upgrade. Also if the user set the dependent option as destroy he expects to get the records removed from the database.
* \| \|	Merge pull request #12739 from laurocaetano/remove_warnings_for_ruby_trunk	Rafael Mendonça França	2013-11-01	5	-6/+6
\|\ \ \ \| \| \| \| \| \| \| \|	Remove warnings on ruby trunk
\| * \| \|	remove warnings on ruby trunk	laurocaetano	2013-11-01	5	-6/+6
\|/ / /
* \| \|	Test with the right association	Rafael Mendonça França	2013-11-01	1	-3/+3
\| \| \|
* \| \|	Merge pull request #12733 from robin850/fix-railties-build	Rafael Mendonça França	2013-11-01	5	-6/+6
\|\ \ \ \| \| \| \| \| \| \| \|	Fix railties build
\| * \| \|	Fix some failing tests for Rails::Paths	Robin Dupret	2013-11-01	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we are not using the File.exists? alias which raises a warning on current ruby trunk, few stubs are wrong.
\| * \| \|	Set the destination_root for plugins	Robin Dupret	2013-11-01	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since the plugin generator is relying on the application one, we need to define the proper root when creating the plugin. The AppBase class is not setting the destination_root (this is done via the AppGenerator)
\| * \| \|	Remove "circular require considered harmful" error	Robin Dupret	2013-11-01	2	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rails/generators should not load rails/generators/base since the latter is loading it.
* \| \| \|	Merge pull request #12735 from linstula/fix-typo-in-responder-comment	Rafael Mendonça França	2013-11-01	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix typo in method description in Responder class
\| * \| \| \|	Fix typo in method description in Responder class	Lin Reid	2013-11-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes a typo in the description for the call class method in Responder.
* \| \| \| \|	Merge pull request #12728 from arunagw/aa-warnings-removed-ruby-trunk	Rafael Mendonça França	2013-11-01	19	-31/+31
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	More Warnings removed for ruby trunk
\| * \| \| \|	shadowing variable warning removed	Arun Agrawal	2013-11-01	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	More Warnings removed for ruby trunk	Arun Agrawal	2013-11-01	19	-30/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Same as 4d4ff531b8807ee88a3fc46875c7e76f613956fb
* \| \| \| \|	:bomb:	Rafael Mendonça França	2013-11-01	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Use consistent order of the arguments	Rafael Mendonça França	2013-11-01	1	-9/+9
\|/ / / /
* \| \| \|	Merge pull request #12729 from arunagw/build-fixed-ruby193	Rafael Mendonça França	2013-11-01	2	-2/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Can't used named argument in ruby 1.9.3
\| * \| \| \|	Passing args for gemfile entry	Arun Agrawal	2013-11-01	2	-2/+8
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Fixing build
* \| \| \|	Merge pull request #12732 from razielgn/additional-rbx-dep	Rafael Mendonça França	2013-11-01	1	-0/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Added rubysl-rexml to Rubinius deps.
\| * \| \|	Added rubysl-rexml to Rubinius deps.	Federico Ravasio	2013-11-01	1	-0/+1
\|/ / /
* \| \|	Merge pull request #12727 from arunagw/aa-warnings-removed-ruby-trunk	Santiago Pastorino	2013-11-01	9	-29/+29
\|\ \ \ \| \| \| \| \| \| \| \|	Warnings removed for ruby trunk
\| * \| \|	Warnings removed for ruby trunk	Arun Agrawal	2013-11-01	9	-29/+29
\|/ / / \| \| \| \| \| \|	Same as 4d4ff531b8807ee88a3fc46875c7e76f613956fb
* \| \|	Merge pull request #12713 from utenmiki/document	Yves Senn	2013-11-01	1	-0/+2
\|\ \ \ \| \| \| \| \| \| \| \|	Add Rdoc document for Array#forty_two [ci skip]
\| * \| \|	Add Rdoc document for Array#forty_two	utenmiki	2013-10-31	1	-0/+2
\| \| \| \|
* \| \| \|	Merge pull request #12722 from razielgn/update-travis-rbx	Rafael Mendonça França	2013-10-31	2	-2/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Updated Rubinius on Travis to 2.1.1
\| * \| \| \|	Added Rubinius 2 specific dependencies.	Federico Ravasio	2013-10-31	1	-0/+6
\| \| \| \| \|
\| * \| \| \|	Updated Rubinius version to 2.1.1	Federico Ravasio	2013-10-31	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	gemfile entries can be added to the app builder	Aaron Patterson	2013-10-31	2	-3/+51
\|/ / / /
* \| \| \|	forgot to add the test. orz :cry:	Aaron Patterson	2013-10-31	1	-0/+50
\| \| \| \|
* \| \| \|	clean up some warnings on trunk ruby	Aaron Patterson	2013-10-31	4	-4/+4
\| \| \| \|
* \| \| \|	add filters for gemfile entries	Aaron Patterson	2013-10-31	1	-3/+9
\| \| \| \|
* \| \| \|	Merge pull request #12712 from robin850/fix-build	Aaron Patterson	2013-10-31	2	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Require time before monkey-patching it
\| * \| \| \|	Require time before monkey-patching it	Robin Dupret	2013-10-31	2	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Same as #12710 but for the time module this time. This time it should fix the Active Model test suite in isolation avoiding a TypeError to be raised about the superclass of the DateTime object.
* \| \| \| \|	Merge pull request #12107 from kares/master	Rafael Mendonça França	2013-10-31	2	-5/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	allow to test AR master against AR-JDBC master (with `ENV['AR_JDBC']`)
\| * \| \| \| \|	`export AR_JDBC=true` on travis-ci as a before_install (but on jruby only)	kares	2013-09-03	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	allow to test AR master against AR-JDBC master (with `ENV['AR_JDBC']`)	kares	2013-09-03	1	-5/+12
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #12704 from JuanitoFatas/routing	Rafael Mendonça França	2013-10-31	1	-90/+93
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Add actions to shallow table, change a tense in sentence, add
\| * \| \| \| \| \|	[ci skip] Make all tables have Controller#Action, change a tense in sentence.	Juanito Fatas	2013-10-31	1	-90/+93
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #12714 from jlecour/patch-1	Rafael Mendonça França	2013-10-31	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|	Fix typo in the CHANGELOG
\| * \| \| \| \| \|	Fix typo in the CHANGELOG	Jérémy Lecour	2013-10-31	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	AS guide: errata	Xavier Noria	2013-10-31	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #12710 from robin850/fix-build	Xavier Noria	2013-10-31	2	-1/+1
\|\ \ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|	Require bigdecimal before monkey-patching it
\| * \| \| \| \|	Require bigdecimal before monkey-patching it	Robin Dupret	2013-10-31	2	-1/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If we try to monkey-patch the class before requiring it, then a "superclass mismatch" (TypeError) error is raised and the build can't run correctly. Fixes #12708
* \| \| \| \|	Merge pull request #12706 from RobZolkos/master	Guillermo Iguaran	2013-10-30	1	-2/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	show javascripts can be disabled in scaffold generator
\| * \| \| \| \|	show javascripts can be disabled in generators	Rob Zolkos	2013-10-31	1	-2/+6
\|/ / / / /