aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Test with the right associationRafael Mendonça França2013-11-011-3/+3
|
* Merge pull request #12733 from robin850/fix-railties-buildRafael Mendonça França2013-11-015-6/+6
|\ | | | | Fix railties build
| * Fix some failing tests for Rails::PathsRobin Dupret2013-11-012-3/+3
| | | | | | | | | | Since we are not using the File.exists? alias which raises a warning on current ruby trunk, few stubs are wrong.
| * Set the destination_root for pluginsRobin Dupret2013-11-011-0/+1
| | | | | | | | | | | | Since the plugin generator is relying on the application one, we need to define the proper root when creating the plugin. The AppBase class is not setting the destination_root (this is done via the AppGenerator)
| * Remove "circular require considered harmful" errorRobin Dupret2013-11-012-3/+2
| | | | | | | | | | rails/generators should not load rails/generators/base since the latter is loading it.
* | Merge pull request #12735 from linstula/fix-typo-in-responder-commentRafael Mendonça França2013-11-011-1/+1
|\ \ | | | | | | Fix typo in method description in Responder class
| * | Fix typo in method description in Responder classLin Reid2013-11-011-1/+1
| | | | | | | | | | | | Fixes a typo in the description for the call class method in Responder.
* | | Merge pull request #12728 from arunagw/aa-warnings-removed-ruby-trunkRafael Mendonça França2013-11-0119-31/+31
|\ \ \ | |/ / |/| | More Warnings removed for ruby trunk
| * | shadowing variable warning removedArun Agrawal2013-11-011-1/+1
| | |
| * | More Warnings removed for ruby trunkArun Agrawal2013-11-0119-30/+30
| | | | | | | | | | | | Same as 4d4ff531b8807ee88a3fc46875c7e76f613956fb
* | | :bomb:Rafael Mendonça França2013-11-011-1/+1
| | |
* | | Use consistent order of the argumentsRafael Mendonça França2013-11-011-9/+9
|/ /
* | Merge pull request #12729 from arunagw/build-fixed-ruby193Rafael Mendonça França2013-11-012-2/+8
|\ \ | | | | | | Can't used named argument in ruby 1.9.3
| * | Passing args for gemfile entryArun Agrawal2013-11-012-2/+8
| |/ | | | | | | Fixing build
* | Merge pull request #12732 from razielgn/additional-rbx-depRafael Mendonça França2013-11-011-0/+1
|\ \ | |/ |/| Added rubysl-rexml to Rubinius deps.
| * Added rubysl-rexml to Rubinius deps.Federico Ravasio2013-11-011-0/+1
|/
* Merge pull request #12727 from arunagw/aa-warnings-removed-ruby-trunkSantiago Pastorino2013-11-019-29/+29
|\ | | | | Warnings removed for ruby trunk
| * Warnings removed for ruby trunkArun Agrawal2013-11-019-29/+29
|/ | | Same as 4d4ff531b8807ee88a3fc46875c7e76f613956fb
* Merge pull request #12713 from utenmiki/documentYves Senn2013-11-011-0/+2
|\ | | | | Add Rdoc document for Array#forty_two [ci skip]
| * Add Rdoc document for Array#forty_twoutenmiki2013-10-311-0/+2
| |
* | Merge pull request #12722 from razielgn/update-travis-rbxRafael Mendonça França2013-10-312-2/+8
|\ \ | | | | | | Updated Rubinius on Travis to 2.1.1
| * | Added Rubinius 2 specific dependencies.Federico Ravasio2013-10-311-0/+6
| | |
| * | Updated Rubinius version to 2.1.1Federico Ravasio2013-10-311-2/+2
| | |
* | | gemfile entries can be added to the app builderAaron Patterson2013-10-312-3/+51
|/ /
* | forgot to add the test. orz :cry:Aaron Patterson2013-10-311-0/+50
| |
* | clean up some warnings on trunk rubyAaron Patterson2013-10-314-4/+4
| |
* | add filters for gemfile entriesAaron Patterson2013-10-311-3/+9
| |
* | Merge pull request #12712 from robin850/fix-buildAaron Patterson2013-10-312-1/+1
|\ \ | | | | | | Require time before monkey-patching it
| * | Require time before monkey-patching itRobin Dupret2013-10-312-1/+1
| | | | | | | | | | | | | | | | | | Same as #12710 but for the time module this time. This time it should fix the Active Model test suite in isolation avoiding a TypeError to be raised about the superclass of the DateTime object.
* | | Merge pull request #12107 from kares/masterRafael Mendonça França2013-10-312-5/+13
|\ \ \ | | | | | | | | allow to test AR master against AR-JDBC master (with `ENV['AR_JDBC']`)
| * | | `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 #12704 from JuanitoFatas/routingRafael Mendonça França2013-10-311-90/+93
|\ \ \ \ | | | | | | | | | | [ci skip] Add actions to shallow table, change a tense in sentence, add
| * | | | [ci skip] Make all tables have Controller#Action, change a tense in sentence.Juanito Fatas2013-10-311-90/+93
| | | | |
* | | | | Merge pull request #12714 from jlecour/patch-1Rafael Mendonça França2013-10-311-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix typo in the CHANGELOG
| * | | | Fix typo in the CHANGELOGJérémy Lecour2013-10-311-1/+1
|/ / / /
* | | | AS guide: errataXavier Noria2013-10-311-1/+1
| | | |
* | | | Merge pull request #12710 from robin850/fix-buildXavier Noria2013-10-312-1/+1
|\ \ \ \ | | |_|/ | |/| | Require bigdecimal before monkey-patching it
| * | | Require bigdecimal before monkey-patching itRobin Dupret2013-10-312-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | If we try to monkey-patch the class before requiring it, then a "superclass mismatch" (TypeError) error is raised and the build can't run correctly. Fixes #12708
* | | Merge pull request #12706 from RobZolkos/masterGuillermo Iguaran2013-10-301-2/+6
|\ \ \ | | | | | | | | show javascripts can be disabled in scaffold generator
| * | | show javascripts can be disabled in generatorsRob Zolkos2013-10-311-2/+6
|/ / /
* | | We need to fix Sam Ruby's tests.Aaron Patterson2013-10-301-1/+0
| | | | | | | | | | | | | | | | | | Revert "always call set_default_accessors from create_root" This reverts commit faa1b82bf2ae5d33bfa1ee5552878d5ca69607b0.
* | | golf down rc file readingAaron Patterson2013-10-301-2/+1
| | |
* | | add a test for whitespace separated args in the rc fileAaron Patterson2013-10-301-0/+16
| | |
* | | avoid object creation if there is no rc fileAaron Patterson2013-10-301-1/+1
| | |
* | | no need to dup, argv is never mutatedAaron Patterson2013-10-301-1/+1
| | |
* | | no need to shiftAaron Patterson2013-10-301-2/+1
| | |
* | | functionally build the argvAaron Patterson2013-10-301-3/+4
| | |
* | | there is no reason for ARGV[0] to be nilAaron Patterson2013-10-302-10/+12
| | |
* | | return argv from the insert methodAaron Patterson2013-10-301-2/+3
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-07 08:08:50 +0000