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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| \| * \| \| \| \|	mispelling asset_tag_helper	Angelo Capilleri	2012-05-13	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Correct code wrapping around content of welcome/index.html.erb	Ryan Bigg	2012-05-14	1	-2/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Wrap 'Missing template posts/new' error message in a blockquote for better ↵	Ryan Bigg	2012-05-14	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	formatting
\| \| * \| \| \| \| \|	Rails actually has one root route defined	Ryan Bigg	2012-05-14	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Separate CR out in CRUD explanation, explain each letter one at a time	Ryan Bigg	2012-05-14	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Re-enforce/re-explain what happens when you go to root route (Welcome#index) ↵	Ryan Bigg	2012-05-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	better
\| \| * \| \| \| \| \|	Briefly explain static file routing in the getting started guide	Ryan Bigg	2012-05-14	1	-1/+1
\| \| \|/ / / / /
\| \| * \| \| \| \|	marking self in Hash#symbolize_keys!	Francesco Rodriguez	2012-05-13	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	added example to Hash#symbolize_keys	Francesco Rodriguez	2012-05-13	1	-2/+5
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	unnecessary 'examples' noise in Hash#assert_valid_keys docs	Francesco Rodriguez	2012-05-13	1	-1/+0
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	added example to Hash#stringify_keys	Francesco Rodriguez	2012-05-13	1	-1/+5
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	adding examples to Hash#deep_merge method	Francesco Rodriguez	2012-05-13	1	-2/+7
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Update docs to public_send for Object#try	Oscar Del Ben	2012-05-13	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	update docs on Object#try	Vasiliy Ermolovich	2012-05-13	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	[guides] add local precompilation section	Richard Hulse	2012-05-13	1	-1/+36
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Initial proof reading of getting started guide	Oscar Del Ben	2012-05-07	1	-19/+22
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #6318 from mpapis/master	José Valim	2012-05-15	1	-0/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix `bundle exec rails new app` not running `bundle install` properly
\| * \| \| \| \| \| \|	prevent using already loaded Gemfile for 'bundle install', fix #6314	Michal Papis	2012-05-15	1	-0/+8
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #6317 from korny/routes-draw-backtrace	Piotr Sarnacki	2012-05-14	4	-3/+55
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add tests and external file backtrace for Routing::Mapper#draw
\| * \| \| \| \| \| \|	add tests and external file backtrace for Routing::Mapper#draw	Kornelius Kalnbach	2012-05-15	4	-3/+55
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #6186 from anydiem/fix_unconventional_pks	Rafael Mendonça França	2012-05-14	2	-1/+13
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Set the primary key during #copy_table if necessary. Fixes [#2312]
\| * \| \| \| \| \| \|	Set the primary key during #copy_table if necessary. Fixes [#2312]	Sean Scally	2012-05-14	2	-1/+13
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Use merge! instead reverse_merge! here	Santiago Pastorino	2012-05-14	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Remove `:disable_with` in favor of `'data-disable-with'` option from ↵	Carlos Galdino + Rafael Mendonça França	2012-05-14	6	-57/+13
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`submit_tag`, `button_tag` and `button_to` helpers.
* \| \| \| \| \| \|	Merge pull request #6220 from frodsan/pass_multiple_value	Rafael Mendonça França	2012-05-14	6	-18/+25
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow define_attribute_methods to pass multiple values
\| * \| \| \| \| \| \|	updating define_attribute_methods documentation	Francesco Rodriguez	2012-05-14	4	-5/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	allow define_attribute_methods to pass multiple values	Francesco Rodriguez	2012-05-14	2	-13/+20
\|/ / / / / / /
* \| \| \| \| \| \|	Remove not used date variable and another test warning	Carlos Antonio da Silva	2012-05-14	1	-2/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Remove assertion on date from humans.txt tests	José Valim	2012-05-14	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Remove dates and environment variables from humans.txt	José Valim	2012-05-14	1	-2/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #6018 from lest/patch-1	Carlos Antonio da Silva	2012-05-14	3	-1/+16
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \|	mailer can be anonymous
\| * \| \| \| \| \|	mailer can be anonymous	Sergey Nartimov	2012-05-13	3	-1/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	closes #5970
* \| \| \| \| \| \|	Since escape_html_entities_in_json was moved to 3-2-stable, make it true in ↵	José Valim	2012-05-14	2	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	AS, closes #6287
* \| \| \| \| \| \|	MySQL doesn't allow default values for blobs.	Rafael Mendonça França	2012-05-13	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Remove `:mouseover` option from `image_tag` helper.	Rafael Mendonça França	2012-05-13	3	-21/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #3237 from sakuro/data-url-scheme	Rafael Mendonça França	2012-05-13	3	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support data: url scheme Conflicts: actionpack/lib/action_view/asset_paths.rb
* \| \| \| \| \| \|	Copy edit [ci skip]	Rafael Mendonça França	2012-05-13	2	-3/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #5807 from Antiarchitect/store-improvement	Rafael Mendonça França	2012-05-13	5	-6/+55
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Custom coders support for ActiveRecord::Store.
\| * \| \| \| \| \| \|	Custom coders support for ActiveRecord::Store. JSON, YAML, Marshal can be ↵	Andrey Voronkov	2012-05-09	5	-6/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	used out of the box.
* \| \| \| \| \| \| \|	Merge pull request #4431 from lest/refactor-1-9	Rafael Mendonça França	2012-05-13	1	-7/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use const_defined? with second argument in AS::Dependencies
\| * \| \| \| \| \| \| \|	use const_defined? with second argument in AS::Dependencies	Sergey Nartimov	2012-05-13	1	-7/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	there is no need in local_const_defined? helper method
* \| \| \| \| \| \| \| \|	Remove dependency on safe_join from number helpers	Carlos Antonio da Silva	2012-05-13	2	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduced in 0f848dd54911f0e15c5c3aceabf09582cc6eab16.
* \| \| \| \| \| \| \| \|	Merge pull request #6305 from arunagw/ruby-prof-fixes	Carlos Antonio da Silva	2012-05-13	3	-2/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ruby prof fixes
\| * \| \| \| \| \| \| \| \|	Need to include "OutputSaftyHelper" here to prevent	Arun Agrawal	2012-05-13	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`number_with_delimiter': undefined method `safe_join' for #<ActiveSupport::Testing::Performance::Metrics::Objects
\| * \| \| \| \| \| \| \| \|	Fixed ruby-prof changes and let's use latest ruby-prof now.	Arun Agrawal	2012-05-13	2	-2/+2
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #6307 from oscardelben/refactor_app_generator_test	Carlos Antonio da Silva	2012-05-13	1	-22/+20
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor App Generator Test
\| * \| \| \| \| \| \| \| \|	Refactor App Generator Test	Oscar Del Ben	2012-05-13	1	-22/+20
\| \|/ / / / / / / /
* \| / / / / / / /	Autoload ActionDispatch::Request::Session to avoid circular require.	Andrew White	2012-05-13	1	-1/+2
\| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #6308 from nashby/blockless-step	José Valim	2012-05-13	1	-10/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove useless tests for Range#step
\| * \| \| \| \| \| \| \|	remove useless tests for Range#step	Vasiliy Ermolovich	2012-05-13	1	-10/+0
\|/ / / / / / / /