aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Creating an SSE class to be used with ActionController::Live.wangjohn2013-07-302-0/+162
* Merge branch 'revert-order-prepending'Rafael Mendonça França2013-07-308-21/+34
|\
| * Revert change on ActiveRecord::Relation#order method that prepends newRafael Mendonça França2013-07-298-21/+34
* | Merge pull request #10673 from sgrif/masterRafael Mendonça França2013-07-295-35/+98
|\ \ | |/ |/|
| * Add ability to specify how a class is converted to Arel predicatesgrif2013-07-285-35/+98
* | only calculate the klass onceAaron Patterson2013-07-291-1/+2
* | Merge pull request #11358 from Alamoz/asset_pipelineXavier Noria2013-07-291-229/+537
|\ \
| * | Update of 'The Asset Pipeline' guide for Rails 4. [ci skip]Adrien Lamothe2013-07-261-229/+537
* | | Merge pull request #10879 from makaroni4/masterAndrew White2013-07-296-0/+50
|\ \ \
| * | | Added Time#middle_of_dayAnatoli Makarevich2013-07-286-1/+51
* | | | Merge pull request #11654 from robin850/freebsdXavier Noria2013-07-291-0/+28
|\ \ \ \
| * | | | Add installation instructions for FreeBSD [ci skip]Robin Dupret2013-07-291-0/+28
* | | | | Merge pull request #11651 from neerajdotname/log_should_mimick_original_log_m...Carlos Antonio da Silva2013-07-291-1/+1
|\ \ \ \ \
| * | | | | interceptor should mimick original methodNeeraj Singh2013-07-291-1/+1
* | | | | | Merge pull request #11653 from ankit8898/typoCarlos Antonio da Silva2013-07-291-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fixing the broken URL [skip ci]Ankit Gupta2013-07-291-1/+1
|/ / / / /
* | | | | Fix handling of offsets with Time#to_s(:iso8601)Andrew White2013-07-297-4/+21
* | | | | Merge pull request #11649 from neerajdotname/use_method_with_active_record_de...Carlos Antonio da Silva2013-07-291-30/+20
|\ \ \ \ \
| * | | | | use method with_active_record_default_timezoneNeeraj Singh2013-07-291-30/+20
| |/ / / /
* | | | | Move changelog entry to the top [ci skip]Carlos Antonio da Silva2013-07-291-5/+7
* | | | | Merge pull request #11648 from prathamesh-sonpatki/doc-fixYves Senn2013-07-291-0/+2
|\ \ \ \ \
| * | | | | Improved the doc about showing posts in getting started guide [ci skip]Prathamesh Sonpatki2013-07-291-0/+2
| |/ / / /
* | | | | Merge pull request #11646 from neerajdotname/remove_duplicate_methodYves Senn2013-07-291-7/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | remove duplicate methodNeeraj Singh2013-07-291-7/+0
|/ / / /
* | | | Add Time#to_s(:iso8601) for easy conversion of times to the iso8601 format fo...David Heinemeier Hansson2013-07-283-1/+7
* | | | Merge pull request #11608 from arunagw/ruby-from-rubygemsAaron Patterson2013-07-286-12/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | grab executable from rubygemsArun Agrawal2013-07-266-12/+6
* | | | Avoid "uninitialized constant ActiveRecord::PendingMigrationError::Rails"Akira Matsuda2013-07-291-1/+1
* | | | Revert "fix order dependent test related to migration"Akira Matsuda2013-07-291-4/+0
* | | | Properly repair validations when dynamically addedAkira Matsuda2013-07-291-24/+30
* | | | Clear class ivar before testingAkira Matsuda2013-07-291-0/+2
* | | | Unneeded assertionAkira Matsuda2013-07-291-1/+1
* | | | Don't rewrite AR connection#commit_db_transaction method globallyAkira Matsuda2013-07-291-4/+4
* | | | Merge pull request #11640 from pawel2105/manifest_fixDavid Heinemeier Hansson2013-07-283-6/+14
|\ \ \ \
| * | | | Changed stylesheet load order in the stylesheet manifest generator.Pawel Janiak2013-07-283-6/+14
* | | | | Merge pull request #11641 from ankit8898/test_cleanupRafael Mendonça França2013-07-282-2/+2
|\ \ \ \ \
| * | | | | Cleanup of class_nameAnkit Gupta2013-07-282-2/+2
| |/ / / /
* | | | | Merge pull request #11634 from neerajdotname/fix_order_dependent_test_for_mig...Rafael Mendonça França2013-07-281-0/+4
|\ \ \ \ \
| * | | | | fix order dependent test related to migrationNeeraj Singh2013-07-281-0/+4
* | | | | | Merge pull request #11635 from neerajdotname/make_test_order_independent_by_r...Rafael Mendonça França2013-07-281-0/+2
|\ \ \ \ \ \
| * | | | | | make test order independent by resetting timezoneNeeraj Singh2013-07-281-0/+2
| |/ / / / /
* | | | | | Merge pull request #11637 from neerajdotname/make_test_not_depend_on_orderRafael Mendonça França2013-07-281-0/+4
|\ \ \ \ \ \
| * | | | | | reset default timezone and make test order independentNeeraj Singh2013-07-281-0/+4
| |/ / / / /
* | | | | | Merge pull request #11638 from neerajdotname/make_order_independent_associati...Rafael Mendonça França2013-07-281-0/+1
|\ \ \ \ \ \
| * | | | | | make test not depend on orderNeeraj Singh2013-07-281-0/+1
| |/ / / / /
* | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-07-285-55/+44
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Typo fixMikhail Dieterle2013-07-281-1/+1
| * | | | | Using markdown-style code quotesMikhail Dieterle2013-07-281-2/+2
| * | | | | Fix lixml2 to libxml2 [ci skip]Robin Dupret2013-07-281-1/+1
| * | | | | Fixes typo in Object#try!Jay Hayes2013-07-261-1/+1