aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* `export AR_JDBC=true` on travis-ci as a *before_install* (but on jruby only)kares2013-09-031-0/+1
* allow to test AR master against AR-JDBC master (with `ENV['AR_JDBC']`)kares2013-09-031-5/+12
* Merge pull request #12105 from rajcybage/fixing_typoYves Senn2013-09-021-1/+1
|\
| * fix the typo [ci skip]Rajarshi Das2013-09-021-1/+1
* | Remove useless comment and white spaces :scissors: [ci skip]Carlos Antonio da Silva2013-09-012-3/+2
* | Reuse variable to avoid symbol usageCarlos Antonio da Silva2013-08-311-2/+2
* | Merge pull request #12097 from kassio/remove-unused-delegate-on-railtieJosé Valim2013-08-311-2/+0
|\ \
| * | Remove unused delegateKassio Borges2013-08-311-2/+0
* | | Merge pull request #11912 from jonkessler/respond-to-signature-fixesRafael Mendonça França2013-08-314-2/+14
|\ \ \
| * | | update Rails::Railtie::Configuration and ActionDispatch::Response#respond_to?...Jon Kessler2013-08-164-2/+14
* | | | clear all connections before forkingAaron Patterson2013-08-311-0/+3
| |/ / |/| |
* | | Revert "Do not dup the binds when visiting the AST"Rafael Mendonça França + Kassio Borges2013-08-313-10/+3
* | | Don't need to check if the scope respond to callRafael Mendonça França + Kassio Borges2013-08-313-7/+3
* | | Revert "reconnect after the fork returns"Rafael Mendonça França2013-08-311-2/+0
* | | Do not dup the binds when visiting the ASTRafael Mendonça França2013-08-313-3/+10
* | | Merge pull request #12095 from kassio/upgrade-jruby-gemsRafael Mendonça França2013-08-311-6/+6
|\ \ \
| * | | upgrade jruby dependenciesKassio Borges2013-08-311-6/+6
|/ / /
* | | Merge pull request #12091 from rywall/pluck-optimizationJosé Valim2013-08-311-2/+1
|\ \ \
| * | | Don't use Enumerable#next in pluck since it is very slowRyan Wallace2013-08-301-2/+1
* | | | Merge pull request #12093 from wangjohn/indentation_in_generatorJosé Valim2013-08-311-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Using indent method to refactor controller generator.wangjohn2013-08-311-3/+3
|/ / /
* | | Merge pull request #12090 from njakobsen/merger-performanceAaron Patterson2013-08-301-3/+3
|\ \ \
| * | | Don't create fibers just to iterateNicholas Jakobsen2013-08-301-3/+3
* | | | reconnect after the fork returnsAaron Patterson2013-08-301-0/+2
* | | | reduce relation allocationsAaron Patterson2013-08-301-1/+3
* | | | remove unused variableAaron Patterson2013-08-301-1/+1
* | | | no need to fully qualifyAaron Patterson2013-08-301-1/+1
* | | | move the cache to the AR models and populate it on inheritedAaron Patterson2013-08-303-24/+50
* | | | add a failing test for marshal + cache problemsAaron Patterson2013-08-301-0/+26
* | | | no need for the const_get since we lockAaron Patterson2013-08-301-5/+1
* | | | require a class for cache computationsAaron Patterson2013-08-302-2/+4
* | | | cache misses should return selfAaron Patterson2013-08-301-1/+1
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-08-314-12/+18
|\ \ \ \ | |/ / / |/| | |
| * | | Fix typos [ci skip]Carlos Antonio da Silva2013-08-301-2/+2
| * | | Add documentation for rake db:setup taskJay Hayes2013-08-291-0/+5
| * | | Note functional equivalence in reset taskJay Hayes2013-08-291-2/+2
| * | | Fix doc for singularize - `pluralized` => `singularized`Vipul A M2013-08-271-1/+1
| * | | Document ability to run a single test.wangjohn2013-08-211-1/+8
| * | | Removing merge conflict remnants in the guides.wangjohn2013-08-211-6/+0
| * | | Moved "`mod_expires` to be enabled" to new line.Prathamesh Sonpatki2013-08-211-2/+2
* | | | Merge pull request #12085 from valk/masterSantiago Pastorino2013-08-301-1/+3
|\ \ \ \
| * | | | FIX reload! within rails console --sandbox causes undefined method rollback u...Val Kotlarov Hoffman2013-08-301-1/+3
| | |_|/ | |/| |
* / | | add missing fixtures fileAaron Patterson2013-08-301-1/+2
|/ / /
* | | Merge pull request #12078 from prathamesh-sonpatki/typoGuillermo Iguaran2013-08-291-1/+1
|\ \ \
| * | | Fix typo in generators test helpr -> helper [ci skip]Prathamesh Sonpatki2013-08-301-1/+1
|/ / /
* | | Merge pull request #12076 from dabit/masterCarlos Antonio da Silva2013-08-293-3/+3
|\ \ \
| * | | Fix broken link to Fixtures documentation on guidesDavid Padilla2013-08-293-3/+3
* | | | Stop messing up with instance variables, use protected as it was meant forCarlos Antonio da Silva2013-08-301-2/+7
* | | | Remove not necessary AR changelog entry, fix markup [ci skip]Carlos Antonio da Silva2013-08-301-6/+1
* | | | make sure there are actually some categories when running the testAaron Patterson2013-08-291-0/+1