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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\|\ \
\| * \|	fix bad test by making number that fits for integer	Neeraj Singh	2013-06-21	1	-1/+5
* \| \|	Merge pull request #10537 from jetthoughts/10428_bug_with_config_assets_preco...	Guillermo Iguaran	2013-06-21	1	-0/+23
\|\ \ \
\| * \| \|	#10428: Added tests for config.assets.precompile	Paul Nikitochkin	2013-06-21	1	-0/+23
* \| \| \|	Merge pull request #11040 from satococoa/fix-create_join_table-document	Carlos Antonio da Silva	2013-06-21	2	-4/+4
\|\ \ \ \
\| * \| \| \|	Fix documents for create_join_table	Satoshi Ebisawa	2013-06-21	2	-4/+4
* \| \| \| \|	Merge pull request #11043 from arunagw/gemcutter_to_rubygems	Carlos Antonio da Silva	2013-06-21	8	-8/+8
\|\ \ \ \ \
\| * \| \| \| \|	Saying gemcutter => rubygems [ci skip]	Arun Agrawal	2013-06-21	8	-8/+8
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #11045 from rajars2576/fixing_action_view	Xavier Noria	2013-06-21	1	-3/+3
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	fix the path of action view from actionpack/lib/action_view => actionview/lib...	Rajarshi Das	2013-06-21	1	-3/+3
\|/ / / /
* \| \| \|	Merge pull request #11039 from robin850/patch-2	Xavier Noria	2013-06-21	1	-5/+5
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Update the feedback instructions [ci skip]	Robin Dupret	2013-06-21	1	-5/+5
\|/ / /
* \| \|	Don't remove trailing slash from PATH_INFO for mounted apps	Piotr Sarnacki	2013-06-21	3	-1/+16
* \| \|	Merge pull request #11014 from senny/10936_inspect_does_not_crash_without_con...	Piotr Sarnacki	2013-06-20	3	-0/+33
\|\ \ \
\| * \| \|	`inspect` for AR model classes does not initiate a new connection.	Yves Senn	2013-06-20	3	-0/+33
* \| \| \|	Merge pull request #11030 from mjtko/fix/backtrace-silencer-noise-with-multip...	Piotr Sarnacki	2013-06-20	3	-5/+29
\|\ \ \ \
\| * \| \| \|	Fix BacktraceCleaner#noise for multiple silencers.	Mark J. Titorenko	2013-06-20	3	-5/+29
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #11032 from strzalek/extract-actionview	Piotr Sarnacki	2013-06-20	337	-66/+1040
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Check if malformed fixture exists first	Łukasz Strzałkowski	2013-06-20	1	-0/+1
\| * \| \|	Restore mistakenly removed malformed file fixtures	Łukasz Strzałkowski	2013-06-20	5	-0/+5
\| * \| \|	Rename AP to AV in info about running tests	Łukasz Strzałkowski	2013-06-20	1	-2/+2