aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11400 from dpdawson/masterYves Senn2013-07-111-1/+1
|\
| * Fix a grammatical error/typo in Active Record Associations guide.Daniel Dawson2013-07-111-1/+1
|/
* Add missing requireAkira Matsuda2013-07-111-0/+1
* Only raise DelegationError if it's is the source of the exceptionAndrew White2013-07-113-10/+44
* Merge pull request #11389 from jetthoughts/11381_fix_hit_database_on_precompileJosé Valim2013-07-104-19/+26
|\
| * #11381: Ignore config.eager_load=true for rakePaul Nikitochkin2013-07-104-19/+26
* | Merge pull request #11394 from robin850/patch-8Steve Klabnik2013-07-101-0/+17
|\ \
| * | Add documentation for add_flash_types [ci skip]Robin Dupret2013-07-101-0/+17
* | | Add missing require so that DateTime has the right superclassAndrew White2013-07-101-0/+1
|/ /
* | Add failing test for #9562Andrew White2013-07-101-0/+5
* | Better not mutate the given options HashAkira Matsuda2013-07-101-3/+3
* | Merge pull request #11391 from schuetzm/remove-swp-fileRafael Mendonça França2013-07-101-0/+0
|\ \
| * | Remove accidentally committed vi .swp file.Marc Schütz2013-07-101-0/+0
|/ /
* | Simplify Array#in_groups_of codeAkira Matsuda2013-07-101-3/+1
* | Speed up Array#splitAkira Matsuda2013-07-101-6/+20
* | Speed up String#truncateAkira Matsuda2013-07-101-1/+1
* | Merge pull request #10642 from LTe/invalid-load-errorYves Senn2013-07-105-1/+38
|\ \
| * | Show real LoadError on helpers requirePiotr Niełacny2013-07-105-1/+38
* | | Speed up AS::Inflector.underscoreAkira Matsuda2013-07-101-2/+1
* | | Speedup AS::Inflector.camelizeAkira Matsuda2013-07-101-1/+3
|/ /
* | Speedup AS::Inflector.deconstantizeAkira Matsuda2013-07-101-1/+1
* | Speedup String#toAkira Matsuda2013-07-101-1/+1
* | Avoid creating an extra Range instanceAkira Matsuda2013-07-101-1/+1
* | Merge pull request #11385 from MarceloCajueiro/remove_string_interpolationRafael Mendonça França2013-07-091-2/+2
|\ \
| * | Remove unnecessary string interpolationMarcelo G. Cajueiro2013-07-091-2/+2
* | | fix visibility of the relation construction methodsAaron Patterson2013-07-091-5/+7
* | | pass arel to select_all rather than depend on method_missingAaron Patterson2013-07-091-1/+1
| |/ |/|
* | Merge pull request #11383 from mattdbridges/simple-format-doc-fixRafael Mendonça França2013-07-091-1/+1
|\ \
| * | Fix simple_format output example ending tagMatt Bridges2013-07-091-1/+1
* | | Make sure that a joins Relation can be merged with has_many :through + associ...Akira Matsuda2013-07-102-1/+11
* | | Return local time for backwards compatibilityAndrew White2013-07-093-10/+27
* | | Merge pull request #11378 from wangjohn/class_for_application_generatorRafael Mendonça França2013-07-092-27/+63
|\ \ \
| * | | Creating a class to handle preparing ARGV.wangjohn2013-07-092-27/+63
* | | | Retain UTC offset when using Time.at_with_coercionAndrew White2013-07-093-3/+47
* | | | Fix microsecond precision of Time#at_with_coercionNeer Friedman2013-07-092-1/+5
* | | | Merge pull request #11372 from wangjohn/fixing_rails_commands_classRafael Mendonça França2013-07-091-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Using the instance variable for argv.wangjohn2013-07-091-2/+2
|/ / /
* | | Merge pull request #11375 from namusyaka/fix_attribute_for_inspectRafael Mendonça França2013-07-092-3/+3
|\ \ \
| * | | Fix: attribute_for_inspect truncate upto (51 => 50) characters.namusyaka2013-07-092-3/+3
|/ / /
* | | Merge pull request #11174 from vipulnsward/remove_column_passingRafael Mendonça França2013-07-091-2/+2
|\ \ \
| * | | Document where `column` param gets utilized in `substitute_at`.Vipul A M2013-07-011-2/+2
* | | | Merge pull request #11073 from tricknotes/improve-guides-jsRafael Mendonça França2013-07-092-36/+32
|\ \ \ \
| * | | | Improve js written for guidesRyunosuke SATO2013-06-252-36/+32
* | | | | Merge pull request #11143 from robin850/upgrading-railsRafael Mendonça França2013-07-091-1/+23
|\ \ \ \ \
| * | | | | Add few information about missing steps [ci skip]Robin Dupret2013-06-291-1/+23
* | | | | | Merge pull request #11354 from jadeatucker/cache_exists_should_return_booleanRafael Mendonça França2013-07-092-3/+3
|\ \ \ \ \ \
| * | | | | | Explicitly test for true and false.Jade Tucker2013-07-071-2/+2
| * | | | | | cache.exists? should return true/falseJade Tucker2013-07-071-1/+1
* | | | | | | Merge pull request #11351 from jetthoughts/cleanup_requestRafael Mendonça França2013-07-091-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use helper method to get ENV['CONTENT_LENGTH']Paul Nikitochkin2013-07-081-1/+1
| |/ / / / / /