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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Tima Maslyuchenko	2012-02-26	1	-1/+1
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	layout affects views not methods	Rajinder Yadav	2012-02-26	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fixed regular expression in Specifying Constraints section	Tima Maslyuchenko	2012-02-26	1	-2/+2
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #4284 from mattdbridges/time_calculation_aliases	Xavier Noria	2012-02-28	6	-6/+80
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added aliases for prev_year, prev_month, and prev_week in Time and Date calculations
\| * \| \| \| \| \| \| \|	Adding :last_week, :last_month, and :last_year aliases to Time and Date	Matt Bridges	2012-02-21	6	-6/+80
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	core extensions
* \| \| \| \| \| \| \| \|	Merge pull request #5199 from gabehollombe/master	Xavier Noria	2012-02-28	1	-2/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The language for describing how to configure ActionController::Base.asset_host could be clearer
\| * \| \| \| \| \| \| \| \|	Change asset_host config language to be more helpful and accurate	Gabe Hollombe	2012-02-28	1	-2/+3
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #5197 from lest/patch-4	José Valim	2012-02-27	1	-6/+0
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	remove unnecessary code
\| * \| \| \| \| \| \| \|	remove unnecessary code	Sergey Nartimov	2012-02-28	1	-6/+0
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it was added in 36129f21b86db4bd69e932e586129e246c2a5ca8 but isn't useful anymore as corresponding tests pass without it
* \| \| \| \| \| \| \|	Revert "only mutate the scope object in the `bind` method"	Aaron Patterson	2012-02-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 1b9e19cd22f2b5d5e7b82e042f92340822c0f966.
* \| \| \| \| \| \| \|	call binmode on the tempfile for Ruby 1.8 compatibility	Aaron Patterson	2012-02-27	1	-1/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	only mutate the scope object in the `bind` method	Aaron Patterson	2012-02-27	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	bind value creation refactoring	Aaron Patterson	2012-02-27	1	-4/+10
\|/ / / / / / /
* \| \| \| \| \| \|	removing dead code	Aaron Patterson	2012-02-27	1	-3/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	use bind values for join columns	Aaron Patterson	2012-02-27	6	-12/+36
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #5191 from rafaelfranca/fix-393	Aaron Patterson	2012-02-27	3	-38/+38
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a new line after the textarea opening tag.
\| * \| \| \| \| \| \|	Add a new line after the textarea opening tag.	Rafael Mendonça França	2012-02-27	3	-38/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #393
* \| \| \| \| \| \| \|	Merge pull request #5168 from kennyj/fix_5152	Aaron Patterson	2012-02-27	2	-1/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[PostgreSQL] Remove NULLS FIRST/LAST. Closes #5152
\| * \| \| \| \| \| \| \|	Remove NULLS FIRST/LAST. closes #5152	kennyj	2012-02-25	2	-1/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #5173 from kennyj/fix_3931-2	Aaron Patterson	2012-02-27	3	-12/+23
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931 (Try again).
\| * \| \| \| \| \| \| \| \|	Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931.	kennyj	2012-02-26	3	-12/+23
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #5179 from RalphShnelvar/Binary_mode_Window_bug	Aaron Patterson	2012-02-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Binary mode window bug
* \| \| \| \| \| \| \| \| \|	Merge pull request #5192 from amatsuda/rdoc_task_19	José Valim	2012-02-27	2	-14/+3
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|	no need to rescue when requiring 'rdoc/task' in Ruby >= 1.9
\| * \| \| \| \| \| \| \| \|	ruby19: no need to rescue when requiring 'rdoc/task' in Ruby >= 1.9	Akira Matsuda	2012-02-27	2	-14/+3
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #5185 from rafaelfranca/fix-collection_helpers	José Valim	2012-02-26	3	-37/+76
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix collection helpers
\| * \| \| \| \| \| \| \| \|	Fix collection_check_boxes and collection_radio_buttons when using local	Rafael Mendonça França	2012-02-26	2	-0/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	variables in the form builder
\| * \| \| \| \| \| \| \| \|	Add documentation to object method of CollectionHelpers::Builder	Rafael Mendonça França	2012-02-26	1	-6/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Move all the helpers to protected section	Rafael Mendonça França	2012-02-26	1	-31/+31
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	updates the new default pool size in some additional places	Xavier Noria	2012-02-26	3	-7/+17
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	let the connection pool of new applications have size 1 rather than 5	Xavier Noria	2012-02-26	4	-12/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The majority of Rails applications are multiprocess, people may wonder why rails new generates a default pool of 5, does my application need a connection pool of 5? By generating a default of 1 database.yml is much more clear, and with the comment people know what is the connection pool for, and they know it has to be bigger for multithread apps.
* \| \| \| \| \| \| \| \|	Adding tests for non-optional glob parameters	Andrew White	2012-02-26	1	-2/+27
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #5174 from nashby/safe-concat	José Valim	2012-02-25	1	-3/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use content_tag instead of strings
\| * \| \| \| \| \| \| \| \|	use content_tag instead strings	Vasiliy Ermolovich	2012-02-25	1	-3/+4
\|/ / / / / / / / /
* \| \| \| / / / / /	A guide for upgrading Rails [ci skip]	Vijay Dev	2012-02-25	2	-0/+169
\| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-02-25	5	-5/+24
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: actionmailer/CHANGELOG.md
\| * \| \| \| \| \| \|	copy-edits [ci skip]	Vijay Dev	2012-02-25	1	-10/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fixed typo in composed_of example with Money#<=>, was comparing amount ↵	Noah Hendrix	2012-02-24	1	-1/+1
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	itself instead of other_money.amount
\| * \| \| \| \| \|	Fix typo in match :to docs	Justin Woodbridge	2012-02-23	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Cosmetic fixes in AM changelog	Alexey Vakhov	2012-02-23	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Revert "Remove meaningless code from the examples" of AutosaveAssociation	Dimitar Dimitrov	2012-02-22	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reverts a part of 91148936f770dc8bbbb33d46a09528f1a32d8a71. Should probably be squashed with it when merging back in rails/rails.
\| * \| \| \| \| \|	Minor fixes to ActiveRecord::AutosaveAssociation's docs	Dimitar Dimitrov	2012-02-22	1	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fix typos * Remove meaningless code from the examples
\| * \| \| \| \| \|	Merge pull request #84 from pawel2105/master	pawel2105	2012-02-21	1	-0/+20
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Database pooling configuration
\| \| * \| \| \| \| \|	Added database pooling sub-section to the 'configuring' guide	Cynical Grinch	2012-02-21	1	-0/+20
\| \|/ / / / / /
\| * \| \| \| \| \|	Fix AbstractController#controller_path doc	Alexey Vakhov	2012-02-19	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #5117 from nashby/form-option-refactor	José Valim	2012-02-25	1	-17/+11
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	FormOptionsHelper refactor
\| * \| \| \| \| \| \|	refactor option_text_and_value and option_value_selected? methods	Vasiliy Ermolovich	2012-02-21	1	-10/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	refactor time_zone_options_for_select	Vasiliy Ermolovich	2012-02-21	1	-7/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BTW, select works quite faster then find_all: require 'benchmark' n = [1]*100_000_000 Benchmark.bm do \|x\| x.report { n.select { \|a\| a > 1 } } x.report { n.find_all { \|a\| a > 1 } } end user system total real 7.590000 0.010000 7.600000 ( 7.927171) 9.650000 0.010000 9.660000 ( 9.634406)
* \| \| \| \| \| \| \|	Merge pull request #4023 from pacoguzman/update-changelogs	Xavier Noria	2012-02-25	7	-11/+480
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|	Update changelogs with rails 3.0-stable branch info
\| * \| \| \| \| \| \|	Update changelogs with rails 3.0-stable branch info	Paco Guzman	2012-02-25	7	-11/+480
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #5163 from kennyj/fix_5119	José Valim	2012-02-25	1	-6/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove wrong and redundant code.