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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \| \| \|	Replace `serve_static_files` in tests with `public_file_server.enabled`.	Kasper Timm Hansen	2015-11-04	4	-5/+5
* \| \| \| \| \|	tests, define `Rails.root` before loading Action Mailer.	Yves Senn	2015-11-04	2	-8/+8
* \| \| \| \| \|	Merge pull request #22173 from kaspth/enable-public-file-server	Kasper Timm Hansen	2015-11-04	7	-17/+84
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Move `static_cache_contorl` deprecation changelog entry to Railties.	Kasper Timm Hansen	2015-11-04	2	-5/+22
\| * \| \| \| \| \|	Add enabled flag to the public file server.	Kasper Timm Hansen	2015-11-03	6	-12/+62
* \| \| \| \| \| \|	Merge pull request #22182 from seanlinsley/patch-1	Rafael França	2015-11-04	1	-0/+7
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	document `try!` in ActiveSupport core ext guide	Sean Linsley	2015-11-04	1	-0/+7
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #22180 from usertesting/arbitrary-url-in-link-to-back	Rafael França	2015-11-04	3	-2/+33
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Don’t allow arbitrary data in back urls	Damien Burke	2015-11-03	3	-2/+33
\| \|/ / / / / /
* \| \| \| \| \| \|	formatting pass over Active Record changelog. [ci skip]	Yves Senn	2015-11-04	1	-18/+20
* \| \| \| \| \| \|	Merge pull request #22174 from metaskills/defsetup	Yves Senn	2015-11-04	3	-7/+6
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Update docs/comments to use setup/teardown blocks vs. methods.	Ken Collins	2015-11-04	1	-1/+0
\| * \| \| \| \| \| \|	Update docs/comments to use setup/teardown blocks vs. methods.	Ken Collins	2015-11-03	3	-6/+6
\| \|/ / / / / /
* \| / / / / /	Remove incorrect comments	Andrew White	2015-11-04	1	-4/+0
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Fix spelling error [ci skip]	Andrew White	2015-11-04	1	-1/+1
* \| \| \| \| \|	don't start a new process for every test file	Aaron Patterson	2015-11-03	1	-8/+21
* \| \| \| \| \|	Fix deprecation message when frame doesn't have absolute_path	Rafael Mendonça França	2015-11-03	1	-1/+1
\|/ / / / /
* \| \| \| \|	Add tests to make sure mail_to work with nil and SafeBuffer	Rafael Mendonça França	2015-11-03	1	-0/+14
* \| \| \| \|	Merge pull request #18774 from yuki24/deprecate-original-exception-infavor-of...	Jeremy Daer	2015-11-03	30	-90/+179
\|\ \ \ \ \
\| * \| \| \| \|	Deprecate exception#original_exception in favor of exception#cause	Yuki Nishijima	2015-11-03	30	-90/+179
* \| \| \| \| \|	Merge pull request #22164 from yui-knk/test_float_limits	Andrew White	2015-11-03	2	-12/+48
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add test_float_limits to mysql2	yui-knk	2015-11-03	2	-12/+48
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #22162 from Gaurav2728/added_instruction_for_rack_cors	Andrew White	2015-11-03	1	-2/+4
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	added missing instructions for `rack-cors`	Gaurav Sharma	2015-11-03	1	-2/+4
\|/ / / / /
* \| \| \| \|	remove present? call; we do not need it	Aaron Patterson	2015-11-02	1	-1/+1
* \| \| \| \|	Merge pull request #21841 from yui-knk/fix_migration_status	Andrew White	2015-11-02	4	-7/+80
\|\ \ \ \ \
\| * \| \| \| \|	Make `db:migrate:status` to render `1_some.rb` format migrate files.	yui-knk	2015-11-02	4	-7/+80
* \| \| \| \| \|	Merge pull request #22156 from yui-knk/fix_test_mysql	Andrew White	2015-11-02	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix test_database_created_by_root of mysql	yui-knk	2015-11-02	1	-1/+1
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #22142 from r11runner/query-guide-first-last-default-scope	Yves Senn	2015-11-02	1	-0/+4
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	[ci skip] querying guide methods first and last: mentioning the influence of ...	r11runner	2015-10-31	1	-0/+4
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #22152 from y-yagi/remove_sass-cache_from_gitignore	Andrew White	2015-11-02	1	-1/+0
\|\ \ \ \ \
\| * \| \| \| \|	remove unnecessary `.sass-cache` from plugin's gitignore template	yuuji.yaginuma	2015-11-02	1	-1/+0
\| \|/ / / /
* \| \| \| \|	Merge pull request #22133 from yui-knk/sanitize_sql_for_order	Andrew White	2015-11-02	5	-5/+30
\|\ \ \ \ \
\| * \| \| \| \|	Define `sanitize_sql_for_order` for AR and use it inside `preprocess_order_args`	yui-knk	2015-11-02	5	-5/+30
\|/ / / / /
* \| \| \| \|	Merge pull request #22090 from kamipo/bigint_default_nil	Andrew White	2015-11-02	4	-3/+36
\|\ \ \ \ \
\| * \| \| \| \|	Allow bigint with default nil for avoiding auto increment primary key	Ryuta Kamizono	2015-11-02	4	-3/+36
\|/ / / / /
* \| \| \| \|	Merge pull request #22061 from kamipo/remove_default_charset_and_collation	Andrew White	2015-11-02	3	-21/+13
\|\ \ \ \ \
\| * \| \| \| \|	Remove `DEFAULT_CHARSET` and `DEFAULT_COLLATION` in `MySQLDatabaseTasks`	Ryuta Kamizono	2015-11-02	3	-21/+13
\|/ / / / /
* \| \| \| \|	Merge pull request #22130 from k0kubun/left-joins-changelog	Andrew White	2015-11-02	1	-0/+5
\|\ \ \ \ \
\| * \| \| \| \|	Add CHANGELOG entry for #22125 [ci skip]	Takashi Kokubun	2015-11-02	1	-0/+5
\|/ / / / /
* \| \| \| \|	Merge pull request #22131 from yui-knk/move_test_to_inheritance_test	Andrew White	2015-11-02	2	-80/+80
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Move some AR test cases to inheritance_test.rb	yui-knk	2015-10-31	2	-80/+80
* \| \| \| \|	Merge pull request #22149 from samphilipd/master	Andrew White	2015-11-01	1	-0/+5
\|\ \ \ \ \
\| * \| \| \| \|	Update changelog for #22122	Sam Davies	2015-11-01	1	-0/+5
\|/ / / / /
* \| \| \| \|	Merge pull request #22147 from jwworth/pull-request/double-string	Richard Schneeman	2015-11-01	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Fix double word 'string' [ci skip]	Jake Worth	2015-11-01	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #22083 from thejamespinto/idempotent-route-generator	Andrew White	2015-11-01	3	-1/+20
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Route generator should be idempotent - closes #22082	Thiago Pinto	2015-10-31	3	-1/+20
* \| \| \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2015-10-31	14	-28/+28
\|\ \ \ \ \