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

	Commit message (Expand)	Author	Age	Files	Lines
*	Use released arel	Godfrey Chan	2014-10-30	2	-2/+2
*	Merge pull request #17440 from claudiob/remove-yet-another-redundant-to-s	Xavier Noria	2014-10-30	9	-15/+15
\|\
\| *	Remove redundant `to_s` in interpolation	claudiob	2014-10-30	9	-15/+15
* \|	Merge branch 'master-sec'	Aaron Patterson	2014-10-30	2	-4/+32
\|\ \
\| * \|	FileHandler should not be called for files outside the root	Aaron Patterson	2014-10-10	2	-4/+32
* \| \|	Add status code to AS::Instrumentation table, like #17441 [ci skip]	Zachary Scott	2014-10-30	1	-0/+1
* \| \|	Merge branch 'strzalek-asn-docs-fix'	Zachary Scott	2014-10-30	1	-0/+1
\|\ \ \
\| * \| \|	Add :db_runtime to table [ci skip]	Łukasz Strzałkowski	2014-10-30	1	-0/+1
\|/ / /
* \| /	Use `#between`, rather than `#in` for passing Ranges to Arel	Sean Griffin	2014-10-30	3	-2/+3
\| \|/ \|/\|
* \|	Merge pull request #17434 from claudiob/remove-redundant-to-s	Xavier Noria	2014-10-30	1	-2/+2
\|\ \
\| * \|	Remove redundant `to_s` in interpolation	claudiob	2014-10-29	1	-2/+2
* \| \|	Merge pull request #17308 from pabloh/small_optimizations	Jeremy Kemper	2014-10-29	3	-3/+3
\|\ \ \
\| * \| \|	Do gsub with a regexp instead of a string	Pablo Herrero	2014-10-29	3	-3/+3
* \| \| \|	add bigserial pk support	Aaron Patterson	2014-10-29	3	-0/+23
* \| \| \|	Merge pull request #17433 from pabloh/fix_typo	Rafael Mendonça França	2014-10-29	1	-2/+2
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	Fix typo at form_helper docs [ci skip]	Pablo Herrero	2014-10-29	1	-2/+2
\|/ / /
* \| \|	Merge pull request #17432 from cmoylan/update-active-job-guide	Rafael Mendonça França	2014-10-29	1	-1/+1
\|\ \ \
\| * \| \|	correct GlobalID mixin name in the guides	Chris Moylan	2014-10-29	1	-1/+1
\|/ / /
* \| \|	Merge pull request #17431 from hbriggs/upgrade_guide_2.7_2.8	Rafael Mendonça França	2014-10-29	1	-3/+3
\|\ \ \
\| * \| \|	[ci skip] Fixes typos in section 2.7 "Rails Html Sanitizer", adds content to ...	Hannah Briggs	2014-10-29	1	-3/+3
\|/ / /
* \| \|	Merge pull request #17429 from edwinwills/full-height-email-preview	Rafael Mendonça França	2014-10-29	1	-1/+4
\|\ \ \
\| * \| \|	On larger screens the email preview iframe is being limited to a height of 80...	Edwin Wills	2014-10-29	1	-1/+4
\|/ / /
* \| \|	Merge pull request #17411 from mcfiredrill/doc-change-column-default-abstract...	Rafael Mendonça França	2014-10-29	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	:nodoc: for abstract_mysql_adapter	Tony Miller	2014-10-29	1	-1/+1
* \| \|	Merge pull request #17427 from dwo/master	Zachary Scott	2014-10-29	1	-1/+1
\|\ \ \
\| * \| \|	better example for tokenizer lambda [ci skip]	Robin Tweedie	2014-10-29	1	-1/+1
\|/ / /
* \| \|	Merge pull request #17423 from lukefx/jruby_windows_tzinfo	Santiago Pastorino	2014-10-29	1	-2/+2
\|\ \ \
\| * \| \|	Added 'tzinfo-data' if we are using jruby	Luca Simone	2014-10-29	1	-2/+2
* \| \| \|	fix MySQL enum type lookup with values matching another type. Closes #17402.	Yves Senn	2014-10-29	3	-6/+17
* \| \| \|	edit pass over all warnings	Xavier Noria	2014-10-28	20	-38/+65
* \| \| \|	Add mysql and pg specific attributes to Column#== and hash	Sean Griffin	2014-10-28	2	-2/+20
* \| \| \|	Merge pull request #17421 from rails/warn-with-heredoc	Xavier Noria	2014-10-28	18	-76/+149
\|\ \ \ \
\| * \| \| \|	let's warn with heredocs	Xavier Noria	2014-10-28	18	-76/+149
* \| \| \| \|	💣	Sean Griffin	2014-10-28	2	-2/+5
* \| \| \| \|	Implement hash equality on column	Sean Griffin	2014-10-28	1	-0/+5
* \| \| \| \|	Implement #== for column	Sean Griffin	2014-10-28	1	-0/+8
* \| \| \| \|	Remove unneccessary default values from relation merger	Sean Griffin	2014-10-28	1	-2/+2
* \| \| \| \|	Fix uninitialized ivar warning in tests	Sean Griffin	2014-10-28	1	-1/+1
* \| \| \| \|	Call value methods when merging relations, rather than accessing keys	Sean Griffin	2014-10-28	1	-14/+14
* \| \| \| \|	Merge pull request #17039 from zv1n/add_prefix_delimiter	Rafael Mendonça França	2014-10-28	3	-2/+45
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Added queue_name_delimiter attribute.	Terry Meacham	2014-10-26	3	-2/+45
* \| \| \| \|	Typos in the deprecation message	Godfrey Chan	2014-10-28	1	-2/+2
* \| \| \| \|	Mention only_path deprecation in release notes [ci skip]	Godfrey Chan	2014-10-28	1	-0/+3
* \| \| \| \|	Deprecate the `only_path` option on `*_path` helpers.	Godfrey Chan	2014-10-28	3	-2/+116
* \| \| \| \|	Merge pull request #17416 from tricknotes/fix-doc-markup	Abdelkader Boudih	2014-10-28	2	-10/+10
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Fix doc markup for `NumberHelper` [ci skip]	Ryunosuke SATO	2014-10-29	2	-10/+10
\|/ / / /
* \| \| \|	Merge pull request #17408 from bf4/fix_rbx_test	Yves Senn	2014-10-28	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fix rbx generated Gemfile regex	Benjamin Fleischer	2014-10-27	1	-1/+1
* \| \| \| \|	Merge pull request #17310 from pabloh/optimize_strftime	Andrew White	2014-10-28	3	-10/+16
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Optimize TimeWithZoneTest#strftime	Pablo Herrero	2014-10-27	3	-10/+16
\| \|/ / /