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

	Commit message (Expand)	Author	Age	Files	Lines
*	Use latest web-console when using --dev or --edge	Sam Ruby	2014-12-05	1	-0/+10
*	Merge pull request #17797 from y-yagi/donot_delete_mailer_layouts	Rafael Mendonça França	2014-12-04	2	-3/+20
\|\
\| *	Don't remove mailer layouts files	yuuji.yaginuma	2014-11-27	2	-3/+20
* \|	Removed use of mocha in the info_controller tests	Prathamesh Sonpatki	2014-12-03	1	-5/+4
* \|	Fix "nonexistent" typo in tests	Melissa Xie	2014-12-02	1	-1/+1
* \|	require 'rake' before requiring Rake tasks	Akira Matsuda	2014-12-03	1	-0/+2
* \|	Silence Minitest for plugin tests.	Guo Xiang Tan	2014-12-02	2	-1/+4
* \|	Merge pull request #17866 from bogdan/default-form-builder	Santiago Pastorino	2014-12-01	1	-0/+39
\|\ \
\| * \|	Bugfix config.action_view.default_form_builder option	Bogdan Gusiev	2014-12-01	1	-0/+39
* \| \|	FIX: absolute_path may be nil for code added via instance_eval	Sam	2014-12-01	1	-1/+1
* \| \|	Merge pull request #17823 from byroot/fix-mount-rack-apps-with-as	Sean Griffin	2014-11-29	1	-0/+20
\|\ \ \
\| * \| \|	Pure rack apps can be mounted with a name	Jean Boussier	2014-11-29	1	-0/+20
\| \|/ /
* \| \|	Pass symbol as an argument instead of a block	Erik Michaels-Ober	2014-11-29	11	-23/+19
* \| \|	adds missing period in test.rb [ci skip]	Xavier Noria	2014-11-29	1	-1/+1
* \| \|	Bump required Ruby version to 2.1.0	claudiob	2014-11-28	2	-4/+4
* \| \|	We don't need to use sass-rails 5.0.0.beta	Rafael Mendonça França	2014-11-28	1	-2/+1
* \| \|	Start Rails 5 development :tada:	Rafael Mendonça França	2014-11-28	2	-211/+4
\|/ /
* \|	docs, AR no longer makes use of `test:prepare`. [ci skip]	Yves Senn	2014-11-28	1	-1/+2
* \|	Revert "Test against rack master"	Santiago Pastorino	2014-11-27	1	-2/+2
* \|	rails -> bin/rails in index.html	Xavier Noria	2014-11-27	1	-1/+1
\|/
*	Test against rack master	Rafael Mendonça França	2014-11-26	1	-2/+2
*	Merge pull request #17761 from pschrammel/master	Yves Senn	2014-11-26	1	-1/+1
\|\
\| *	be more general with adapter name	Peter Schrammel	2014-11-25	1	-1/+1
* \|	Merge pull request #17782 from cheba/engine-root-master	Rafael Mendonça França	2014-11-26	1	-1/+1
\|\ \
\| * \|	Use absolute_path of caller_locations to infer engine root	Alexander Mankuta	2014-11-26	1	-1/+1
* \| \|	Provide support for SQL Server connections with dbconsole using sqsh	Juan Ignacio Pumarino	2014-11-26	1	-0/+15
\|/ /
* \|	Use jquery-rails 4.0.0	Rafael Mendonça França	2014-11-25	1	-8/+2
* \|	Merge pull request #17773 from gsamokovarov/mention-web-console-2.0-rc1	Sean Griffin	2014-11-25	1	-1/+1
\|\ \
\| * \|	Use web_console 2.0 for 4.2.0.rc1 release	Genadi Samokovarov	2014-11-26	1	-1/+1
* \| \|	Generators add foreign keys on references	Derek Prior	2014-11-25	3	-1/+51
* \| \|	Fix syntax error :bomb:	Rafael Mendonça França	2014-11-25	1	-2/+2
\|/ /
* \|	Use released rails-dom-testing	Rafael Mendonça França	2014-11-25	1	-2/+0
* \|	bring back `db:test:prepare`.	Yves Senn	2014-11-25	2	-9/+92
* \|	tests, run `test_test.rb` with `RAILS_ENV=test`.	Yves Senn	2014-11-25	1	-1/+1
* \|	Added tests for log_level deprecation	Godfrey Chan	2014-11-25	1	-13/+18
* \|	Set the test_order in the basic app as well, see 58e8b48	Godfrey Chan	2014-11-25	2	-0/+26
* \|	Set the default log_level to info in all tests	Godfrey Chan	2014-11-25	1	-0/+1
* \|	Merge pull request #17757 from zzak/railties-default-to-debug-log_level	Godfrey Chan	2014-11-25	1	-0/+1
\|\ \
\| * \|	Always default the log_level to :info for Railties	Zachary Scott	2014-11-24	1	-0/+1
* \| \|	Merge pull request #17755 from zzak/changelog-for-16622	Godfrey Chan	2014-11-25	1	-0/+4
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Add a CHANGELOG entry for #16622 and a6de6f5 [ci skip]	Zachary Scott	2014-11-24	1	-0/+4
\| \|/
* \|	Generate mailer layouts even if no action is given.	Guo Xiang Tan	2014-11-25	2	-4/+6
* \|	MailerGenerator should inherit from Base.	Guo Xiang Tan	2014-11-25	1	-3/+4
* \|	Add tests which were incorrectly removed.	Guo Xiang Tan	2014-11-25	3	-4/+10
* \|	Merge pull request #17646 from andyjeffries/html_layout_fix	David Heinemeier Hansson	2014-11-25	5	-10/+48
\|\ \
\| * \|	Removing unnecessary File.join calls	Andy Jeffries	2014-11-24	1	-1/+1
\| * \|	Creates an ApplicationMailer and layout by default, including html and body t...	Andy Jeffries	2014-11-21	5	-10/+48
* \| \|	Fix sprockets-rails dependency dance	Arthur Neves	2014-11-24	1	-2/+0
\| \|/ \|/\|
* \|	Merge pull request #17737 from yui-knk/fix/head	Santiago Pastorino	2014-11-24	1	-2/+2
\|\ \
\| * \|	Replace ActionDispatch::Head with Rack::Head.	yui-knk	2014-11-24	1	-2/+2