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

	Commit message (Expand)	Author	Age	Files	Lines
*	application template respects Gemfile entries	Aaron Patterson	2013-11-04	2	-0/+25
*	gems can be added or skipped from the template	Aaron Patterson	2013-11-04	4	-2/+92
*	fix copy & paste test-case naming. [ci skip]	Yves Senn	2013-11-04	1	-1/+1
*	document `BACKTRACE` env var usage in testing guide. [ci skip]	Yves Senn	2013-11-04	1	-0/+11
*	Fix failures related to enum changes	Carlos Antonio da Silva	2013-11-04	1	-6/+4
*	Convert schema file to ruby 1.9 style hash	Carlos Antonio da Silva	2013-11-04	1	-214/+214
*	Style fixes on test schema file	Carlos Antonio da Silva	2013-11-04	1	-6/+6
*	Merge pull request #12755 from cbartlett/master	Carlos Antonio da Silva	2013-11-04	1	-1/+1
\|\
\| *	Remove extra whitespace	Colin Bartlett	2013-11-04	1	-1/+1
* \|	Refactor logic to grab the max time of the list of timestamp names in #cache_key	Carlos Antonio da Silva	2013-11-04	2	-4/+4
* \|	Respect cache timestamp format when giving timestamps to #cache_key	Carlos Antonio da Silva	2013-11-04	2	-3/+4
\|/
*	:scissors: [ci skip]	Carlos Antonio da Silva	2013-11-04	2	-5/+2
*	Merge pull request #12754 from ck3g/replace-class-evals-with-define-method-fo...	David Heinemeier Hansson	2013-11-04	1	-4/+12
\|\
\| *	Replace `class_eval` with `define_method` for enum	Vitaly Tatarintsev	2013-11-04	1	-4/+12
* \|	Fix typo in railties changelog	Carlos Antonio da Silva	2013-11-04	1	-2/+2
* \|	Fix changelog indent [ci skip]	Carlos Antonio da Silva	2013-11-04	1	-6/+6
\|/
*	BACKTRACE environment variable to show unfiltered backtraces.	Yves Senn	2013-11-04	3	-6/+48
*	Merge pull request #12750 from arunagw/webconsole-invite-only	Guillermo Iguaran	2013-11-03	3	-15/+0
\|\
\| *	No web-console for now	Arun Agrawal	2013-11-03	3	-15/+0
\|/
*	Line up the comments for aesthetics	David Heinemeier Hansson	2013-11-03	1	-5/+5
*	Aesthetics	David Heinemeier Hansson	2013-11-03	1	-22/+30
*	Code style for privacy indention	David Heinemeier Hansson	2013-11-03	1	-8/+8
*	Ensure backwards compability after the #deep_munge extraction	David Heinemeier Hansson	2013-11-03	1	-0/+10
*	Add test verifying that you can only sort ARs of the same type	David Heinemeier Hansson	2013-11-02	1	-1/+7
*	Revert "ActiveRecord::Base#<=> has been removed. Primary keys may not be in ...	David Heinemeier Hansson	2013-11-02	3	-12/+16
*	Delegate #rewhere to all on the class like all other relation methods	David Heinemeier Hansson	2013-11-02	2	-1/+5
*	Move documentation around a bit	David Heinemeier Hansson	2013-11-02	1	-4/+7
*	Merge pull request #12747 from yury/explicit-enum-values	David Heinemeier Hansson	2013-11-02	4	-1/+15
\|\
\| *	Explicit mapping for enum	Yury Korolev	2013-11-02	4	-1/+15
* \|	Added ActiveRecord::QueryMethods#rewhere which will overwrite an existing, na...	David Heinemeier Hansson	2013-11-02	3	-0/+52
* \|	unscope now works on default_scope after 94924dc32baf78f13e289172534c2e71c9c8...	Rafael Mendonça França	2013-11-02	3	-9/+9
\|/
*	Add a test case for the scope enum adds	David Heinemeier Hansson	2013-11-02	1	-0/+4
*	Extend ActiveRecord::Base#cache_key to take an optional list of timestamp att...	David Heinemeier Hansson	2013-11-02	4	-2/+27
*	Merge branch 'master' of github.com:rails/rails	David Heinemeier Hansson	2013-11-02	10	-94/+48
\|\
\| *	Use an already existing fixture	Carlos Antonio da Silva	2013-11-02	1	-1/+1
\| *	Fix to work on Ruby 1.9.3, example and changelog improvements	Carlos Antonio da Silva	2013-11-02	4	-34/+34
\| *	Improve wording in AC::ParameterMissing error message	Guillermo Iguaran	2013-11-02	1	-1/+1
\| *	Update guides welcome page to point to version 3.2.15 [ci skip]	Carlos Antonio da Silva	2013-11-02	1	-1/+1
\| *	Revert "Merge pull request #9660 from sebasoga/change_strong_parameters_requi...	Guillermo Iguaran	2013-11-02	5	-57/+11
* \|	Added Numeric#in_milliseconds, like 1.hour.in_milliseconds, so we can feed th...	David Heinemeier Hansson	2013-11-02	3	-0/+14
\|/
*	Added ActiveRecord::Base#enum for declaring enum attributes where the values ...	David Heinemeier Hansson	2013-11-02	7	-2/+128
*	Merge pull request #12686 from kryzhovnik/master	Carlos Antonio da Silva	2013-11-02	1	-6/+6
\|\
\| *	Minor doc fix of ActiveModel::Naming.	Andrey Samsonov	2013-10-29	1	-6/+6
* \|	Merge pull request #9660 from sebasoga/change_strong_parameters_require_behav...	Guillermo Iguaran	2013-11-01	5	-11/+57
\|\ \
\| * \|	Change ActionController::Parameters#require behavior when value is empty	Sebastian Sogamoso	2013-03-11	5	-11/+57
* \| \|	Fix wrong behavior where associations with dependent: :destroy options	Rafael Mendonça França	2013-11-01	3	-10/+7
* \| \|	Merge pull request #12739 from laurocaetano/remove_warnings_for_ruby_trunk	Rafael Mendonça França	2013-11-01	5	-6/+6
\|\ \ \
\| * \| \|	remove warnings on ruby trunk	laurocaetano	2013-11-01	5	-6/+6
\|/ / /
* \| \|	Test with the right association	Rafael Mendonça França	2013-11-01	1	-3/+3
* \| \|	Merge pull request #12733 from robin850/fix-railties-build	Rafael Mendonça França	2013-11-01	5	-6/+6
\|\ \ \