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

	Commit message (Expand)	Author	Age	Files	Lines
*	No verbose backtrace by db:drop when database does not exist.	Kenn Ejima	2014-07-27	2	-0/+8
*	Fix protect_from_forgery docs	David Albert	2014-07-27	1	-1/+1
*	Fix that render layout should also be picked up by the template dependency tr...	David Heinemeier Hansson	2014-07-25	3	-4/+29
*	Merge pull request #16290 from a3gis/master	Zachary Scott	2014-07-25	2	-2/+2
\|\
\| *	Remove references to SQLite3Column from documentation	a3gis	2014-07-25	1	-1/+1
\| *	Fix documentation of SQlite3Adapter.columns	a3gis	2014-07-25	1	-1/+1
* \|	Merge pull request #16285 from noinkling/password_digest_docs	Rafael Mendonça França	2014-07-25	2	-2/+18
\|\ \
\| * \|	Additional clarification on password:digest in scaffold and model generator h...	noinkling	2014-07-25	2	-4/+16
\| * \|	Add password:digest information to scaffold generator help text [ci skip]	noinkling	2014-07-25	1	-1/+5
* \| \|	docs, add ref where to find valid `head` status symbols.	Yves Senn	2014-07-25	1	-0/+2
* \| \|	Merge pull request #16258 from mattwarrenrnp/master	Yves Senn	2014-07-25	1	-11/+20
\|\ \ \
\| * \| \|	adding indexes on tables in migration scripts	Matt Warren	2014-07-24	1	-11/+20
* \| \| \|	Merge pull request #16220 from pcreux/postgresql-jsonb-support	Yves Senn	2014-07-25	6	-9/+64
\|\ \ \ \
\| * \| \| \|	Add support for Postgresql JSONB	Philippe Creux	2014-07-24	6	-9/+64
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #16272 from tgxworld/fix_template_assertion_when_opening_a...	Matthew Draper	2014-07-25	2	-9/+53
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Improve description of tests.	Guo Xiang Tan	2014-07-25	1	-4/+4
\| * \| \|	Bug fix for assert_template when opening a new session.	Guo Xiang Tan	2014-07-25	2	-5/+49
* \| \| \|	Merge pull request #16281 from arthurnn/copy_default_proc_hwia	Santiago Pastorino	2014-07-24	3	-0/+16
\|\ \ \ \
\| * \| \| \|	Make HWIA copy the default proc too.	Arthur Neves	2014-07-24	3	-0/+16
\|/ / / /
* \| \| \|	tests, run adapter specific rake tests only for the right adapter.	Yves Senn	2014-07-24	3	-0/+6
* \| \| \|	build fix, fix error introduced with 091b246bb0111357edbb9703ea342a944b04deb6	Yves Senn	2014-07-24	1	-2/+2
* \| \| \|	fix, mysql `db:purge` respects `Rails.env`.	Yves Senn	2014-07-24	2	-1/+5
* \| \| \|	clenaup, unify CHANGELOG format. [ci skip]	Yves Senn	2014-07-24	1	-5/+7
* \| \| \|	Merge pull request #16280 from a3gis/master	Matthew Draper	2014-07-24	1	-2/+2
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Fix documentation typo in ConnectionSpecification::Resolve.spec	a3gis	2014-07-24	1	-1/+1
\| * \| \|	Fixes #16265	a3gis	2014-07-24	1	-1/+1
* \| \| \|	pg, `change_column_default, :table, :column, nil` issues `DROP DEFAULT`.	Yves Senn	2014-07-24	2	-1/+16
* \| \| \|	Merge pull request #16276 from y-yagi/bug_report_templates	Matthew Draper	2014-07-24	2	-0/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	[ci skip]Add i18n master to the Gemfile	yuuji.yaginuma	2014-07-24	2	-0/+2
\| \|/ /
* \| \|	Merge pull request #16260 from akshay-vishnoi/doc-change	Matthew Draper	2014-07-24	1	-2/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Calling require_self twice in css raises Sprockets::ArgumentError exception [...	Akshay Vishnoi	2014-07-24	1	-2/+1
* \| \|	Remove mocha usage	Rafael Mendonça França	2014-07-23	1	-2/+5
* \| \|	Fix syntax error	Rafael Mendonça França	2014-07-23	1	-1/+2
* \| \|	Dev and edge application and plugins need to include i18n master	Rafael Mendonça França	2014-07-23	1	-1/+2
* \| \|	Merge pull request #16267 from robin850/rbx-yaml	Rafael Mendonça França	2014-07-23	3	-0/+28
\|\ \ \
\| * \| \|	Set Psych as the YAML engine for Rubinius	Robin Dupret	2014-07-23	3	-0/+28
* \| \| \|	Do not set enforce_available_locales to i18n 0.7	Rafael Mendonça França	2014-07-23	3	-22/+4
* \| \| \|	Split Action Pack tests in a new job on travis	Rafael Mendonça França	2014-07-23	1	-1/+2
* \| \| \|	Use PROCESS_COUNT to define the number of parallel executors	Rafael Mendonça França	2014-07-23	1	-1/+1
* \| \| \|	specify N=0 to prevent parallel tests (just run tests on the main process)	Aaron Patterson	2014-07-23	1	-2/+6
\|/ / /
* \| \|	Merge pull request #16237 from tonytonyjan/patch	Arthur Nogueira Neves	2014-07-23	1	-4/+5
\|\ \ \
\| * \| \|	`create` return an active record object with erros instead of false when vali...	Tony Jian	2014-07-23	1	-4/+5
* \| \| \|	Merge pull request #16234 from tgxworld/fix_template_assertion_for_integratio...	Yves Senn	2014-07-22	3	-5/+66
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Fix AC::TemplateAssertions instance variables not resetting.	Guo Xiang Tan	2014-07-21	3	-5/+66
\| \|/ /
* \| \|	Merge pull request #16256 from akshay-vishnoi/doc-change	Rafael Mendonça França	2014-07-22	1	-1/+1
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Fixes #16255 [ci skip]	Akshay Vishnoi	2014-07-22	1	-1/+1
\|/ /
* \|	Merge pull request #16231 from Envek/type_in_references	Yves Senn	2014-07-22	6	-5/+56
\|\ \
\| * \|	Allow to specify a type for foreign key column in migrations	Andrey Novikov	2014-07-22	6	-3/+46
\|/ /
* \|	Merge pull request #16253 from zuhao/refactor_activerecord_nested_through_ass...	Yves Senn	2014-07-22	1	-1/+1
\|\ \
\| * \|	Make sure assertion passes for postgresql.	Zuhao Wan	2014-07-22	1	-1/+1