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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \|	Merge pull request #13027 from akshay-vishnoi/f-refactor	Yves Senn	2013-11-25	1	-1/+1
\|\ \ \| \| \| \| \| \|	avoiding calling of #option_value_selected? two times
\| * \|	avoiding calling of #option_value_selected? two times	Akshay Vishnoi	2013-11-25	1	-1/+1
\| \| \|
* \| \|	Merge pull request #13029 from akshay-vishnoi/documentation	Yves Senn	2013-11-25	1	-4/+4
\|\ \ \ \| \|_\|/ \|/\| \|	`delgated` => `delegated`
\| * \|	`delgated` => `delegated`	Akshay Vishnoi	2013-11-25	1	-4/+4
\| \| \|
* \| \|	Merge pull request #13025 from pwnall/nice_test	Yves Senn	2013-11-25	3	-0/+19
\|\ \ \ \| \| \| \| \| \| \| \|	Better error message for typos in assert_response argument.
\| * \| \|	Better error message for typos in assert_response argument.	Victor Costan	2013-11-25	3	-0/+19
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	This commit makes it really easy to debug errors due to typos like "assert_response :succezz".
* \| \|	Merge pull request #13026 from vipulnsward/document_rewhere	Yves Senn	2013-11-24	1	-0/+26
\|\ \ \ \| \| \| \| \| \| \| \|	Added `rewhere` usage to AR querying guides
\| * \| \|	Added `rewhere` usage to AR querying guides	Vipul A M	2013-11-25	1	-0/+26
\|/ / /
* \| \|	Merge pull request #13020 from razielgn/raise-inspectable-messages	Carlos Antonio da Silva	2013-11-24	2	-4/+4
\|\ \ \ \| \| \| \| \| \| \| \|	Raise RuntimeErrors with inspectable and MRI-independent messages.
\| * \| \|	Raise RuntimeErrors with inspectable and MRI-independent messages.	Federico Ravasio	2013-11-24	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previous behaviour was MRI-dependent, now we're making sure the message is correctly shown: something that can be relyied upon across every Ruby implementation.
* \| \| \|	Merge remote-tracking branch 'docrails/master'	Xavier Noria	2013-11-24	29	-183/+203
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activesupport/lib/active_support/core_ext/hash/deep_merge.rb activesupport/lib/active_support/core_ext/hash/keys.rb
\| * \| \| \|	a couple of copy-edits before merging [ci skip]	Xavier Noria	2013-11-24	1	-3/+2
\| \| \| \| \|
\| * \| \| \|	API Documentation Guidelines link correction [ci skip]	Harshad Sabne	2013-11-23	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Improve reading / style of hashes in AR guide	Carlos Antonio da Silva	2013-11-19	1	-5/+5
\| \| \| \| \|
\| * \| \| \|	Revert last two commits mistakenly changing join/include syntax	Carlos Antonio da Silva	2013-11-19	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	--- Revert "syntax error joining/including models" This reverts commit ac35f72f30c47298a20a90c8c537db888b463bbb. --- Revert "syntax error joining tables" This reverts commit c365986b48c3e8bc8c7f3fa6a8521616ed5dc138. --- Comments: https://github.com/rails/docrails/commit/c365986b48c3e8bc8c7f3fa6a8521616ed5dc138#commitcomment-4630684
\| * \| \| \|	syntax error joining/including models	Sergio	2013-11-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	syntax error joining/including models
\| * \| \| \|	syntax error joining tables	Sergio	2013-11-18	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	syntax error joining tables
\| * \| \| \|	The option is called encode_big_decimal_as_string [ci-skip]	Godfrey Chan	2013-11-15	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Update action_controller_overview.md [ci skip]	Harshad Sabne	2013-11-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Code style adherence
\| * \| \| \|	Fix broken Wikipedia link.	Harshad Sabne	2013-11-13	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Remove outdated guide on using rack builder w/o rails middleware	Alex Johnson	2013-11-13	1	-20/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Correct guide relating MiddlewareStackProxy with Enumerable	Alex Johnson	2013-11-13	1	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Enumerable.instance_methods & Rails::Configuration::MiddlewareStackProxy.instance_methods # => [:as_json] MiddlewareStackProxy does not share any notable methods with Enumerable.
\| * \| \| \|	[ci skip] Replace #=> with # =>	Alex Johnson	2013-11-12	3	-17/+17
\| \| \| \| \|
\| * \| \| \|	Fix RailsServer#start content in initialization guide	Alex Johnson	2013-11-12	1	-17/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Change syntax format for example returned values	Prem Sichanugrist	2013-11-11	19	-107/+107
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	According to our guideline, we leave 1 space between `#` and `=>`, so we want `# =>` instead of `#=>`. Thanks to @fxn for the suggestion. [ci skip]
\| * \| \| \|	Add section for command_tasks in initialization guide	Alex Johnson	2013-11-08	1	-12/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Update commands.rb content in initialization guide	Alex Johnson	2013-11-08	1	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Update README.rdoc [ci skip]	Harshad Sabne	2013-11-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Highlighted code
* \| \| \| \|	Merge pull request #13021 from razielgn/rbx-gemfile-and-travis-fixes	Rafael Mendonça França	2013-11-24	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Updated allow_failures for Rubinius 2.2.1.
\| * \| \| \| \|	Updated allow_failures for Rubinius 2.2.1.	Federico Ravasio	2013-11-24	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #13019 from razielgn/rbx-gemfile-and-travis-fixes	Rafael Mendonça França	2013-11-24	2	-5/+3
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	Rubinius Gemfile and travis fixes
\| * \| \| \|	Properly fix Rubinius dependencies in Gemfile & Travis integration.	Federico Ravasio	2013-11-24	2	-5/+3
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before Rubinius 2.2.0, some parts of the stdlib were lazily loaded, even if not included in the Gemfile. Now it's 100% required to include the gem 'rubysl', otherwise the stdlib is not available entirely, breaking everything. Also, the rubysl-test-unit gem was depending on minitest ~> 4.7, thus causing conflicts with Rails's dependency on minitest 5. That is not the case anymore since rubysl-test-unit 2.0.2, so it is completely safe to include it fully. When Travis is going to update RVM to 1.24, it'll be safe to use rbx-2, thus picking new versions automatically.
* \| \| \|	Merge pull request #13016 from arunagw/test-for-skip-assets-controller	Guillermo Iguaran	2013-11-23	1	-0/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Test for when controller with skip-assets
\| * \| \| \|	Test for when controller with skip-assets	Arun Agrawal	2013-11-23	1	-0/+6
\|/ / / /
* \| \| \|	Merge pull request #13015 from arunagw/task-creation-command-test	Yves Senn	2013-11-23	1	-1/+13
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Added test when task generator called on revoke
\| * \| \| \|	Added test when task generator called on revoke	Arun Agrawal	2013-11-23	1	-1/+13
\|/ / / /
* \| \| \|	Merge pull request #13012 from harrigan/master	Yves Senn	2013-11-23	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Helper should be a module in Rails guides [ci skip]
\| * \| \| \|	Helper should be a module in Rails guides [ci skip]	Martin Harrigan	2013-11-23	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #13011 from arunagw/jruby-fixes	Yves Senn	2013-11-23	1	-2/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Using activerecord-jdbcsqlite3-adapter
\| * \| \| \|	Using activerecord-jdbcsqlite3-adapter	Arun Agrawal	2013-11-23	1	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PluginGeneratorTest needs to have activerecord-jdbcsqlite3-adapter to pass under JRuby
* \| \| \| \|	Merge pull request #13010 from arunagw/cleanedup-generator-test	Yves Senn	2013-11-23	1	-21/+6
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Cleaned up app generator test
\| * \| \| \|	Cleaned up app generator test	Arun Agrawal	2013-11-23	1	-21/+6
\|/ / / /
* \| \| \|	Merge pull request #13007 from chancancode/dont_call_as_json_with_nil	Jeremy Kemper	2013-11-22	2	-2/+18
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Don't call #as_json on children of Array and Hash with nil when no arguments are passed
\| * \| \| \|	When Array#as_json and Hash#as_json are called without options, they	Godfrey Chan	2013-11-22	2	-2/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	should also call #as_json on the children without options (instead of nil)
* \| \| \| \|	Merge pull request #12774 from exAspArk/fix_uniqueness_on_relation	Yves Senn	2013-11-22	3	-1/+24
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Fix validation on uniqueness
\| * \| \| \|	Fix validation on uniqueness of empty association	Evgeny Li	2013-11-22	3	-1/+24
\|/ / / /
* \| \| \|	Use a more generic assertion to make sure this tests will be useful.	Rafael Mendonça França	2013-11-22	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we are using assert_no_match, if we change the code before changing the tests, the tests will still pass and the assertion will become useless
* \| \| \|	Merge pull request #13003 from laurocaetano/fix_assertion_for_turbolinks	Rafael Mendonça França	2013-11-22	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix the assertion for not inclusion of turbolinks on application.js.
\| * \| \| \|	Fix the assertion for not inclusion of turbolinks on application.js.	Lauro Caetano	2013-11-22	1	-1/+1
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We were asserting if `//= turbolinks` was not present while the correct is asserting that `//= require turbolinks` is not present.
* \| \| \|	Improve changelogs	Carlos Antonio da Silva	2013-11-22	4	-11/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also make Action Mailer changelog format more consistent with the others [ci skip]