aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
* | | return argv from more methodsAaron Patterson2013-10-301-2/+4
| | |
* | | return argv from each methodAaron Patterson2013-10-301-4/+6
| | |
* | | pass argv to each method that mutates itAaron Patterson2013-10-301-12/+10
| | |
* | | add a comment to people of the futureAaron Patterson2013-10-301-1/+5
| | |
* | | adding a test for --help defaultsAaron Patterson2013-10-301-0/+7
| | |
* | | change the test to make argv a little more realisticAaron Patterson2013-10-301-7/+6
| | |
* | | adding a test for the current behaviorAaron Patterson2013-10-301-0/+18
| | |
* | | add a test for the rc commandline optionAaron Patterson2013-10-301-0/+18
| | |
* | | remove useless assertionsAaron Patterson2013-10-301-2/+0
| | |
* | | test some of the rc specificationAaron Patterson2013-10-302-4/+48
| | |
* | | forgot the test, oops!Aaron Patterson2013-10-301-0/+36
| | |
* | | stop mutating ARGVAaron Patterson2013-10-302-3/+3
| | |
* | | prepare! should return argvAaron Patterson2013-10-301-0/+1
| | |
* | | rename AppPreparerAaron Patterson2013-10-304-3/+5
| | | | | | | | | | | | | | | AppPreparer doesn't actually prepare applications, it scrubs ARGV. Let's also get the class under test while we're at it
* | | Merge branch 'master' of github.com:rails/railsAaron Patterson2013-10-3012-233/+257
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of github.com:rails/rails: Fix release instructions Raise an error when AS::JSON.decode is called with options Moved all JSON core extensions into core_ext/object/json
| * | | Fix release instructionsRafael Mendonça França2013-10-301-1/+1
| | | | | | | | | | | | [ci skip]
| * | | Merge pull request #12214 from chancancode/json_decode_does_not_take_optionsJeremy Kemper2013-10-303-5/+14
| |\ \ \ | | | | | | | | | | Raise an error when AS::JSON.decode is called with options
| | * | | Raise an error when AS::JSON.decode is called with optionsGodfrey Chan2013-10-303-5/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails 4.1 has switched away from MultiJson, and does not currently support any options on `ActiveSupport::JSON.decode`. Passing in unsupported options (i.e. any non-empty options hash) will now raise an ArgumentError. Rationale: 1. We cannot guarantee the underlying JSON parser won't change in the future, hence we cannot guarantee a consistent set of options the method could take 2. The `json` gem, which happens to be the current JSON parser, takes many dangerous options that is irrelevant to the purpose of AS's JSON decoding API 3. To reserve the options hash for future use, e.g. overriding default global options like ActiveSupport.parse_json_times This change *DOES NOT* introduce any changes in the public API. The signature of the method is still decode(json_text, options). The difference is this method previously accepted undocumented options which does different things when the underlying adapter changes. It now correctly raises an ArgumentError when it encounters options that it does not recognize (and currently it does not support any options).
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-17 11:59:35 +0000