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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11000 from sbeckeriv/accept_header	Carlos Antonio da Silva	2013-06-25	3	-1/+15
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix undefined method `ref' for nil:NilClass for bad accept headers	Stephen Becker IV	2013-06-19	3	-1/+11
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11046 from arunagw/verbose_mode_on	Carlos Antonio da Silva	2013-06-25	5	-5/+7
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding verbose in isolated test.	Arun Agrawal	2013-06-21	5	-5/+5
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding verbose mode to test_with_ar_integration	Arun Agrawal	2013-06-21	1	-0/+2
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'error-explanation'	Carlos Antonio da Silva	2013-06-25	2	-6/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix another "error_explanation" css class in guides [ci skip]	Carlos Antonio da Silva	2013-06-25	1	-3/+3
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	change id="errorExplanation" to id="error_explanation" to match the generated...	Luzi Humm	2013-06-25	1	-3/+3
\|/ / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11096 from akalyaev/remove-unnecessary-mapping	Carlos Antonio da Silva	2013-06-25	1	-5/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	removed unnecessary mapping for on options	Anton Kalyaev	2013-06-25	1	-5/+5
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11095 from vipulnsward/rails_4_docs	Xavier Noria	2013-06-25	3	-5/+8
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We are now rails 4 [skip-ci]	Vipul A M	2013-06-26	3	-5/+8
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11098 from vredniy/master	Rafael Mendonça França	2013-06-25	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed menu section's location (guides)	Dima Zudochkin	2013-06-25	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11097 from ryancw/patch-2	Rafael Mendonça França	2013-06-25	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Comment typo	Ryan Williams	2013-06-25	1	-2/+2
\|/ / / / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11093 from nolman/restoring-scaffold-generation	Rafael Mendonça França	2013-06-25	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	restore correct scaffold generation	Nolan Evans	2013-06-25	1	-1/+1
\|/ / / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change reference to all to scoped instead.	Steve Klabnik	2013-06-25	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11088 from nolman/nolman/scaffold-fix	Steve Klabnik	2013-06-25	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix deprecation warning in scaffold controllers	Nolan Evans	2013-06-25	1	-1/+1
\|/ / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11084 from arkiver/master	Yves Senn	2013-06-25	3	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixing Issue #11083	Akshay Khole	2013-06-25	3	-3/+3
\|/ / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove trailing whitespace from Active Record CHANGELOG	Yves Senn	2013-06-25	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify what arguments are passed to redirect blocks - fixes #11056	Andrew White	2013-06-25	1	-3/+3
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix shorthand routes where controller and action are in the scope	Andrew White	2013-06-25	2	-2/+19
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test-case => failing	Yves Senn	2013-06-25	1	-0/+13
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11069 from ykzts/actiondispatch-ssl-secure-flag-igonore-case	Guillermo Iguaran	2013-06-24	2	-1/+15
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Flag cookies as secure with ignore case in ActionDispatch::SSL	Yamagishi Kazutoshi	2013-06-24	2	-1/+15
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11065 from gbuesing/hstsfix	Guillermo Iguaran	2013-06-24	2	-2/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActionDispatch:SSL: don't include STS header in non-https responses	Geoff Buesing	2013-06-23	2	-2/+6
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add CHANGELOG entry for #10971	Rafael Mendonça França	2013-06-24	1	-1/+15
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11075 from vipulnsward/remove_record	Yves Senn	2013-06-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix `another_contract` not being used warning	Vipul A M	2013-06-24	1	-1/+1
\|/ / / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test-case to prevent regressions described in #10901.	Jared Armstrong	2013-06-24	1	-0/+27
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11067 from rajars2576/fix_older_rocket	Guillermo Iguaran	2013-06-23	3	-20/+20
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	replace all older rocket sign to new ":" from examples of active record and a...	Rajarshi Das	2013-06-24	3	-20/+20
\|/ / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Setup env and seed_loaded for DatabaseTasks outside load_config	Piotr Sarnacki	2013-06-23	1	-2/+3
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change a way ActiveRecord's config is prepared for rake tasks	Piotr Sarnacki	2013-06-23	1	-10/+14
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge pull request #11053 from yangchenyun/mine"	José Valim	2013-06-22	1	-2/+0
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test-case to prevent regressions on `Association#build` with an Array.	Yves Senn	2013-06-22	1	-0/+10
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11053 from yangchenyun/mine	Yves Senn	2013-06-22	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add explicit AS dependencies for ActiveModel::Naming	Steven Yang	2013-06-22	1	-0/+2
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #10796 from neerajdotname/10669	Jon Leighton	2013-06-22	3	-2/+19
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	flatten merged join_values before building the joins	Neeraj Singh	2013-06-22	3	-2/+19
\|/ / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11050 from robin850/remove-rails-test-mention	Carlos Antonio da Silva	2013-06-21	1	-2/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove code related to the rails test command	Robin Dupret	2013-06-21	1	-2/+0
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11051 from neerajdotname/10509f	Jon Leighton	2013-06-21	3	-1/+25
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	do not load all child records for inverse case	Neeraj Singh	2013-06-21	3	-1/+25
\|/ / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11049 from neerajdotname/no-need-of-large-number	Jon Leighton	2013-06-21	1	-1/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \