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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| *	Edited railties/guides/source/active_support_core_extensions.textile via GitHub	Oge Nnadi	2011-04-11	1	-1/+1
\| \| \|
\| \| *	fix example query	Vijay Dev	2011-04-06	1	-1/+1
\| \| \|
\| \| *	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-04-04	15	-29/+124
\| \| \|\
\| \| * \	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-03-31	5	-47/+21
\| \| \|\ \
\| \| * \ \	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-03-29	11	-18/+64
\| \| \|\ \ \
\| \| * \ \ \	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-03-27	1	-2/+2
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-03-27	7	-8/+65
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	remove to from to to :)	Vijay Dev	2011-03-16	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Change Object#either? to Object#among? -- thanks to @jamesarosen for the ↵	David Heinemeier Hansson	2011-04-12	8	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	suggestion!
\| * \| \| \| \| \| \|	Keep the same API semantics for update/delete as we had for XML (just return ↵	David Heinemeier Hansson	2011-04-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	200 OK, no body)
\| * \| \| \| \| \| \|	Cant use inclusion in commands/application.rb as the frameworks havent all ↵	David Heinemeier Hansson	2011-04-11	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	been required yet
\| * \| \| \| \| \| \|	Using Object#in? and Object#either? in various places	Prem Sichanugrist	2011-04-11	9	-10/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There're a lot of places in Rails source code which make a lot of sense to switching to Object#in? or Object#either? instead of using [].include?.
\| * \| \| \| \| \| \|	Add --old-style-hash option to force creating old style hash on Ruby 1.9	Prem Sichanugrist	2011-04-10	5	-2/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	That means if you don't like the new syntax, you can pass --old-style-hash to force Rails to generate code with hash rockets.
\| * \| \| \| \| \| \|	Rails will now generate Ruby 1.9 style hash when running app generator on ↵	Prem Sichanugrist	2011-04-10	5	-4/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ruby 1.9.x The new hash syntax of Ruby 1.9 looks more superior, so we decide to switch to it in the places that appropriate.
\| * \| \| \| \| \| \|	Rails will now generate Ruby 1.9 style hash when running scaffold_controller ↵	Prem Sichanugrist	2011-04-10	6	-19/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	generator on Ruby 1.9.x The new hash syntax of Ruby 1.9 looks more superior, so we decide to switch to it in the places that appropriate. This patch has been requested by DHH.
\| * \| \| \| \| \| \|	Make scaffold_controller generator generate code for JSON response instead ↵	Prem Sichanugrist	2011-04-10	2	-14/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	of XML It seems like a lot of people are using JSON in their API more than XML nowadays, so Rails should follow that convention by providing the JSON format block in scaffold_controller by default. This patch has been requested by DHH
\| * \| \| \| \| \| \|	make turn a soft dependency. generate a Gemfile that contains turn and ↵	Aaron Patterson	2011-04-08	3	-7/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	require turn if it is available
\| * \| \| \| \| \| \|	added find_zone and find_zone! to AS timezones and changed the AS Railtie to ↵	Josh Kalderimis	2011-04-05	1	-0/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use find_zone! as well as adding Railtie tests Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
\| * \| \| \| \| \| \|	remove AM delegating register_observer and register_interceptor to Mail and ↵	Josh Kalderimis	2011-04-04	1	-0/+65
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	instead implement smarter versions allowing for string class names, also added proper Railtie support with tests. Signed-off-by: José Valim <jose.valim@gmail.com>
\| * \| \| \| \| \|	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-04-03	11	-59/+32
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	added .'s to headings in the initialization textile page	orta	2011-04-03	1	-3/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	s/ERb/ERB/g (part II)	Akira Matsuda	2011-04-03	4	-5/+5
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	s/ERb/ERB/g	Akira Matsuda	2011-04-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The author of ERB sais, his eRuby implementation was originally named "ERb/ERbLight" and then renamed to "ERB" when started bundled as a Ruby standard lib. http://www2a.biglobe.ne.jp/~seki/ruby/erb.html
\| \| * \| \| \| \| \|	fix typo	burningTyger	2011-04-01	1	-1/+1
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Grammar tweaks to the guides guidelines	Josiah Ivey	2011-03-31	1	-9/+10
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Minor rephrasing to improve grammar and readability.	mhutchin	2011-03-29	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fixed typo and improved readability.	mhutchin	2011-03-29	1	-1/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix Basic Authentication examples	Sebastian Martinez	2011-03-28	2	-3/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Updated Basic Authentication guides to reflect new ↵	Sebastian Martinez	2011-03-28	2	-36/+8
\| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Base.http_basic_authenticate_with method
\| \| * \| \| \|	Minor typo correction.	mhutchin	2011-03-27	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Gem::Specification#has_rdoc= is deprecated since rubygems 1.7.0	Santiago Pastorino	2011-04-02	1	-1/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Moved Turn activation/dependency to railties	David Heinemeier Hansson	2011-03-31	4	-1/+12
\| \| \| \| \| \|
\| * \| \| \| \|	Direct logging of Active Record to STDOUT so it's shown inline with the ↵	David Heinemeier Hansson	2011-03-31	2	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	results in the console [DHH]
* \| \| \| \| \|	Fix assets prefix joining	Joshua Peek	2011-03-30	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Fix assets prefix joining	Joshua Peek	2011-03-30	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Fix config.assets.precompile option	Joshua Peek	2011-03-30	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Unify sprockets config options	Joshua Peek	2011-03-30	3	-17/+24
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' into sprockets	Joshua Peek	2011-03-30	17	-38/+198
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: railties/lib/rails/application/configuration.rb
\| * \| \| \| \|	Delegate first!, last!, any? and many? to scoped	Andrew White	2011-03-29	1	-0/+20
\| \| \| \| \| \|
\| * \| \| \| \|	Update the wildcard route to be non-greedy by default, therefore be able to ↵	Prem Sichanugrist	2011-03-29	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	match the (.:format) segment [#6605 state:resolved] After some discussion with Andrew White, it seems like this is a better approach for handling a wildcard route. However, user can still bring back the old behavior by supplying `:format => false` to the route. Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
\| * \| \| \| \|	Engines that use isolate_namespace with nested modules should set correct ↵	Rolf Timmermans	2011-03-28	2	-2/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	module prefix for their routes.
\| * \| \| \| \|	let these heredocs flow with the code	Xavier Noria	2011-03-28	1	-14/+15
\| \| \| \| \| \|
\| * \| \| \| \|	Make edge and dev options use edge mysql2	Santiago Pastorino	2011-03-27	1	-6/+14
\| \|/ / / /
\| * \| \| \|	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-03-27	2	-2/+4
\| \|\ \ \ \
\| \| * \| \| \|	AR validations and callbacks guide: put update_attribute back	Xavier Noria	2011-03-27	1	-0/+2
\| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	A little minor rephrasing for improved readability.	mhutchin	2011-03-27	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Minor typo fix.	mhutchin	2011-03-27	1	-1/+1
\| \| \| \|/ \| \| \|/\|
\| \| * \|	Updated guides for new #update_column.	Sebastian Martinez	2011-03-26	1	-2/+2
\| \| \| \|
\| * \| \|	Fix documentation typo	Prem Sichanugrist	2011-03-28	1	-1/+1
\| \| \| \|
\| * \| \|	Add controller-specific `force_ssl` method to force web browser to use HTTPS ↵	Prem Sichanugrist	2011-03-28	1	-0/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	protocol This would become useful for site which sometime transferring sensitive information such as account information on particular controller or action. This featured was requested by DHH.