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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \| \|	Merge pull request #12609 from corwinkelly/patch-1	Xavier Noria	2013-11-08	1	-3/+1
\|\ \ \ \ \
\| * \| \| \| \|	Fix undefined method error for NilClass	corwinkelly	2013-10-23	1	-1/+1
\| * \| \| \| \|	Update workaround for "Outside the Scope of Strong Parameters"	corwinkelly	2013-10-22	1	-3/+1
* \| \| \| \| \|	Merge pull request #12803 from arunagw/remove-unused-require	Rafael Mendonça França	2013-11-08	1	-2/+0
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Removed unused require	Arun Agrawal	2013-11-08	1	-2/+0
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #12292 from bf4/better_database_yaml	Xavier Noria	2013-11-08	11	-145/+85
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Extract common database defaults; better use of YAML	Benjamin Fleischer	2013-11-08	11	-145/+85
\|/ / / / /
* \| \| \| \|	Merge pull request #12791 from jasonayre/ja/fix_autoload_error	Rafael Mendonça França	2013-11-07	2	-0/+6
\|\ \ \ \ \
\| * \| \| \| \|	revised changelog comment to be less than 80 chars	Jason Ayre	2013-11-07	1	-2/+2
\| * \| \| \| \|	add autoload :TransactionState to fix Marshal.load issues	Jason Ayre	2013-11-07	2	-0/+6
* \| \| \| \| \|	Merge pull request #12795 from arunagw/plateform-dependent-gems	Rafael Mendonça França	2013-11-07	2	-0/+16
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Added platform dependent gems	Arun Agrawal	2013-11-07	2	-0/+16
* \| \| \| \| \| \|	Merge pull request #12800 from raysrashmi/warning-removed-ruby-trunk	Rafael Mendonça França	2013-11-07	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Warning removed for ruby-head	Rashmi Yadav	2013-11-07	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #12799 from arunagw/aa-av-test-fixes	Jeremy Kemper	2013-11-07	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	sub! can return nil	Arun Agrawal	2013-11-07	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #12798 from arunagw/plugin-generators-test	Guillermo Iguaran	2013-11-07	1	-1/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fixed plugin_generator test	Arun Agrawal	2013-11-07	1	-1/+4
* \| \| \| \| \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2013-11-07	10	-37/+83
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Update Rails initialization guide to explain how bin/rails is executed	Alex Johnson	2013-11-06	1	-3/+36
\| * \| \| \| \| \|	refine usage docs of `store` in combination with `hstore` and `json`.	Yves Senn	2013-11-06	1	-3/+3
\| * \| \| \| \| \|	Fixed code syntax for config.ru [ci skip]	Rashmi Yadav	2013-11-04	1	-1/+1
\| * \| \| \| \| \|	exists? is deprecated in ruby trunk [ci skip]	Rashmi Yadav	2013-11-01	2	-4/+4
\| * \| \| \| \| \|	Hstore and JSON fields are not supported with store	Robin Dupret	2013-10-30	1	-0/+4
\| * \| \| \| \| \|	guides/rails_on_rack: Fix formatting of _Internal Middleware Stack_ section	Zachary Scott	2013-10-28	1	-23/+23
\| * \| \| \| \| \|	fix typo introduced when searching in markdown document with vim	Damien Mathieu	2013-10-24	1	-14/+14
\| * \| \| \| \| \|	rephrase the overriding views part about the view path	Damien Mathieu	2013-10-24	1	-15/+15
\| * \| \| \| \| \|	Fixed URL link to rendered_component plugin [ci skip]	Harshad Sabne	2013-10-23	1	-1/+1
\| * \| \| \| \| \|	warning about saving models with dirty attributes	Damien Mathieu	2013-10-23	1	-0/+3
\| * \| \| \| \| \|	Update 4_0_release_notes.md	Harshad Sabne	2013-10-22	1	-2/+2
\| * \| \| \| \| \|	Fixes typo	Jay Hayes	2013-10-20	1	-1/+1
\| * \| \| \| \| \|	Update 3_2_release_notes.md	Harshad Sabne	2013-10-20	1	-1/+1
\| * \| \| \| \| \|	Update I18n guide to note the additional features of the `translate` view helper	Jay Hayes	2013-10-19	1	-1/+7
\| * \| \| \| \| \|	Updated 3.2.x link [ci skip]	Rashmi Yadav	2013-10-18	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #12228 from ersatzryan/standardize-json-time-formats	Andrew White	2013-11-07	5	-7/+12
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Standardize all JSON encoded times to use 3 decimal fractional seconds	Ryan Glover	2013-11-07	5	-7/+12
\|/ / / / / /
* \| \| \| \| \|	Aesthetics	Rafael Mendonça França	2013-11-07	1	-13/+13
* \| \| \| \| \|	Merge pull request #12787 from notalex/extract_method	Rafael Mendonça França	2013-11-07	1	-23/+34
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Move interrupt information to print_boot_information method	Alex Johnson	2013-11-07	1	-4/+1
\| * \| \| \| \| \|	Extract method refactoring for Rails::Server#start	Alex Johnson	2013-11-07	1	-24/+38
* \| \| \| \| \| \|	Merge pull request #12771 from bogdan/patch-1	Yves Senn	2013-11-07	1	-4/+4
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix AS::TimeWithZone#as_json docs	Bogdan Gusiev	2013-11-07	1	-4/+4
* \| \| \| \| \| \| \|	only ask for these ivars if the target responds to them	Aaron Patterson	2013-11-06	1	-3/+3
* \| \| \| \| \| \| \|	Merge pull request #12792 from chancancode/move_json_requires	Rafael Mendonça França	2013-11-06	2	-8/+7
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Move the JSON extension require statements to the right place.	Godfrey Chan	2013-11-06	2	-8/+7
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #12785 from chancancode/do_not_leak_internal_state	Jeremy Kemper	2013-11-06	5	-58/+45
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Do not expose internal state in the public encoder API (i.e. as_json)	Godfrey Chan	2013-11-06	4	-55/+42
\| * \| \| \| \| \| \| \|	Moved AS::JSON::DATE_REGEX as it's only used for decoding	Godfrey Chan	2013-11-06	2	-3/+3
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Stop using method missing for singleton delegation.	Aaron Patterson	2013-11-06	5	-9/+15
* \| \| \| \| \| \| \|	drop one more string allocation	Aaron Patterson	2013-11-06	1	-1/+1