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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2016-06-03	1	-1/+1
\|\
\| *	`behaviour` --> `behavior`	Jon Moss	2016-05-27	1	-1/+1
* \|	Properly support reloading for Action Cable channels	Matthew Draper	2016-06-02	2	-2/+0
* \|	Merge pull request #25231 from prathamesh-sonpatki/collapse-new-initializers	David Heinemeier Hansson	2016-06-01	10	-155/+59
\|\ \
\| * \|	Collapse all new default initializers into a single file	Prathamesh Sonpatki	2016-05-31	10	-155/+59
* \| \|	Bump jbuilder dependency to version 2.5.0 for compatibility fixes	David Heinemeier Hansson	2016-05-31	1	-1/+1
\|/ /
* \|	Move new default initializers into separate directory	Prathamesh Sonpatki	2016-05-28	11	-35/+37
* \|	Fix more assertion counts.	Kasper Timm Hansen	2016-05-28	1	-2/+2
* \|	Fix assertion count after 69e1bb52.	Kasper Timm Hansen	2016-05-28	1	-2/+2
* \|	Merge pull request #25182 from rails/remove-public-files-for-api-apps	David Heinemeier Hansson	2016-05-28	2	-1/+18
\|\ \
\| * \|	Remove public/ files for API apps	Prathamesh Sonpatki	2016-05-28	2	-1/+18
* \| \|	Redirects are to urls, not paths	David Heinemeier Hansson	2016-05-28	1	-3/+3
* \| \|	The first comment does not explain anything that the code doesnt and the seco...	David Heinemeier Hansson	2016-05-28	1	-2/+0
* \| \|	Boil down custom Action Cable configuration to a single block	David Heinemeier Hansson	2016-05-28	1	-4/+2
\|/ /
* \|	Merge pull request #25119 from javan/actioncable/blade-build	Rafael França	2016-05-24	1	-1/+0
\|\ \
\| * \|	Remove package:clean task	Javan Makhmali	2016-05-24	1	-1/+0
* \| \|	Fixing commands with Markdown formatting	Anubhav Saxena	2016-05-24	1	-3/+3
* \| \|	Remove version header from railties CHANGELOG.md (#25122)	Jon Moss	2016-05-24	1	-2/+0
* \| \|	Merge pull request #25061 from eugeneius/rails_max_threads_mysql_sqlite	Richard Schneeman	2016-05-24	10	-2/+10
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Use RAILS_MAX_THREADS as pool size on all adapters	Eugene Kenny	2016-05-24	10	-2/+10
* \| \|	Fix and optimize scaffold CSS [ci skip]	Andrii Ponomarov	2016-05-22	1	-8/+4
* \| \|	Add backticks to `config/secrets.yml`	Jon Moss	2016-05-21	1	-1/+1
* \| \|	Merge pull request #24170 from maclover7/fix-24168	Rafael França	2016-05-21	1	-2/+1
\|\ \ \
\| * \| \|	Un-hide helper and assets options for controller generator	Jon Moss	2016-03-12	1	-2/+1
* \| \| \|	Added a shared section to config/secrets.yml that will be loaded for all envi...	David Heinemeier Hansson	2016-05-21	4	-3/+46
* \| \| \|	Merge pull request #24918 from prathamesh-sonpatki/cable-assets	Rafael França	2016-05-21	2	-4/+24
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	Cable: Generate .js or .coffee files while generating channel as per the java...	Prathamesh Sonpatki	2016-05-17	2	-4/+24
* \| \| \|	`md5` --> `MD5`	Jon Moss	2016-05-17	1	-1/+1
\|/ / /
* \| /	reorder env keys in the generated config/cable.yml	Xavier Noria	2016-05-15	1	-5/+4
\| \|/ \|/\|
* \|	Use sass-rails and coffee-rails that work with Rails 5.1	Rafael Mendonça França	2016-05-10	1	-2/+2
* \|	Start Rails 5.1 development :tada:	Rafael Mendonça França	2016-05-10	2	-530/+3
* \|	Preparing for 5.0.0.rc1 release	Rafael Mendonça França	2016-05-06	2	-1/+6
* \|	Fix etag expectation to work with the SHA256	Rafael Mendonça França	2016-05-06	1	-1/+1
* \|	Fix some typos in comments.	Joe Rafaniello	2016-05-04	2	-2/+2
* \|	Prep Rails 5 beta 4	eileencodes	2016-04-27	2	-1/+3
* \|	Merge pull request #24696 from y-yagi/remove_unnessary_option_setting	Kasper Timm Hansen	2016-04-25	4	-5/+24
\|\ \
\| * \|	register rake options to `OptionParser`	yuuji.yaginuma	2016-04-25	2	-0/+14
\| * \|	remove unnessary option setting from test runner	yuuji.yaginuma	2016-04-25	2	-5/+10
* \| \|	removes useless use of string interpolation	Xavier Noria	2016-04-24	1	-2/+2
* \| \|	Fix broken build, channel files are also included in `bin/rails stats` now	Prathamesh Sonpatki	2016-04-24	1	-2/+2
* \| \|	add channels files in `stats` task	yuuji.yaginuma	2016-04-24	1	-0/+1
* \| \|	Add compatibility for Ruby 2.4 `to_time` changes	Andrew White	2016-04-23	4	-0/+51
* \| \|	Fix test name	Vipul A M	2016-04-23	1	-1/+1
\|/ /
* \|	Merge pull request #24680 from mohitnatoo/rake-dev-cache	Kasper Timm Hansen	2016-04-21	1	-1/+1
\|\ \
\| * \|	- using rails dev:cache instead of rake dev:cache	Mohit Natoo	2016-04-22	1	-1/+1
* \| \|	Merge pull request #24664 from y-yagi/use_wrapper_file_to_add_rake_task_for_e...	Rafael França	2016-04-21	1	-1/+1
\|\ \ \
\| * \| \|	use wrapper file to add rake task for engines	yuuji.yaginuma	2016-04-21	1	-1/+1
* \| \| \|	use rails command in `time:zones` task desc [ci skip]	yuuji.yaginuma	2016-04-20	1	-1/+1
\|/ / /
* \| \|	Merge pull request #20625 from Envek/add_country_zones_method	Jeremy Daer	2016-04-19	1	-6/+23
\|\\| \|
* \| \|	mention rails 5 instead of rails 4 in bin/rails for plugins	Ben A. Morgan	2016-04-19	1	-1/+2
\|/ /