Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #12713 from utenmiki/document | Yves Senn | 2013-11-01 | 1 | -0/+2 | |
|\ \ \ | | | | | | | | | Add Rdoc document for Array#forty_two [ci skip] | |||||
| * | | | Add Rdoc document for Array#forty_two | utenmiki | 2013-10-31 | 1 | -0/+2 | |
| | | | | ||||||
* | | | | Merge pull request #12722 from razielgn/update-travis-rbx | Rafael Mendonça França | 2013-10-31 | 2 | -2/+8 | |
|\ \ \ \ | | | | | | | | | | | Updated Rubinius on Travis to 2.1.1 | |||||
| * | | | | Added Rubinius 2 specific dependencies. | Federico Ravasio | 2013-10-31 | 1 | -0/+6 | |
| | | | | | ||||||
| * | | | | Updated Rubinius version to 2.1.1 | Federico Ravasio | 2013-10-31 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | gemfile entries can be added to the app builder | Aaron Patterson | 2013-10-31 | 2 | -3/+51 | |
|/ / / / | ||||||
* | | | | forgot to add the test. orz :cry: | Aaron Patterson | 2013-10-31 | 1 | -0/+50 | |
| | | | | ||||||
* | | | | clean up some warnings on trunk ruby | Aaron Patterson | 2013-10-31 | 4 | -4/+4 | |
| | | | | ||||||
* | | | | add filters for gemfile entries | Aaron Patterson | 2013-10-31 | 1 | -3/+9 | |
| | | | | ||||||
* | | | | Merge pull request #12712 from robin850/fix-build | Aaron Patterson | 2013-10-31 | 2 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Require time before monkey-patching it | |||||
| * | | | | Require time before monkey-patching it | Robin Dupret | 2013-10-31 | 2 | -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/master | Rafael Mendonça França | 2013-10-31 | 2 | -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) | kares | 2013-09-03 | 1 | -0/+1 | |
| | | | | | | ||||||
| * | | | | | allow to test AR master against AR-JDBC master (with `ENV['AR_JDBC']`) | kares | 2013-09-03 | 1 | -5/+12 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #12704 from JuanitoFatas/routing | Rafael Mendonça França | 2013-10-31 | 1 | -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 Fatas | 2013-10-31 | 1 | -90/+93 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #12714 from jlecour/patch-1 | Rafael Mendonça França | 2013-10-31 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Fix typo in the CHANGELOG | |||||
| * | | | | | | Fix typo in the CHANGELOG | Jérémy Lecour | 2013-10-31 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | AS guide: errata | Xavier Noria | 2013-10-31 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #12710 from robin850/fix-build | Xavier Noria | 2013-10-31 | 2 | -1/+1 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | Require bigdecimal before monkey-patching it | |||||
| * | | | | | Require bigdecimal before monkey-patching it | Robin Dupret | 2013-10-31 | 2 | -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/master | Guillermo Iguaran | 2013-10-30 | 1 | -2/+6 | |
|\ \ \ \ \ | | | | | | | | | | | | | show javascripts can be disabled in scaffold generator | |||||
| * | | | | | show javascripts can be disabled in generators | Rob Zolkos | 2013-10-31 | 1 | -2/+6 | |
|/ / / / / | ||||||
* | | | | | We need to fix Sam Ruby's tests. | Aaron Patterson | 2013-10-30 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "always call set_default_accessors from create_root" This reverts commit faa1b82bf2ae5d33bfa1ee5552878d5ca69607b0. | |||||
* | | | | | golf down rc file reading | Aaron Patterson | 2013-10-30 | 1 | -2/+1 | |
| | | | | | ||||||
* | | | | | add a test for whitespace separated args in the rc file | Aaron Patterson | 2013-10-30 | 1 | -0/+16 | |
| | | | | | ||||||
* | | | | | avoid object creation if there is no rc file | Aaron Patterson | 2013-10-30 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | no need to dup, argv is never mutated | Aaron Patterson | 2013-10-30 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | no need to shift | Aaron Patterson | 2013-10-30 | 1 | -2/+1 | |
| | | | | | ||||||
* | | | | | functionally build the argv | Aaron Patterson | 2013-10-30 | 1 | -3/+4 | |
| | | | | | ||||||
* | | | | | there is no reason for ARGV[0] to be nil | Aaron Patterson | 2013-10-30 | 2 | -10/+12 | |
| | | | | | ||||||
* | | | | | return argv from the insert method | Aaron Patterson | 2013-10-30 | 1 | -2/+3 | |
| | | | | | ||||||
* | | | | | return argv from more methods | Aaron Patterson | 2013-10-30 | 1 | -2/+4 | |
| | | | | | ||||||
* | | | | | return argv from each method | Aaron Patterson | 2013-10-30 | 1 | -4/+6 | |
| | | | | | ||||||
* | | | | | pass argv to each method that mutates it | Aaron Patterson | 2013-10-30 | 1 | -12/+10 | |
| | | | | | ||||||
* | | | | | add a comment to people of the future | Aaron Patterson | 2013-10-30 | 1 | -1/+5 | |
| | | | | | ||||||
* | | | | | adding a test for --help defaults | Aaron Patterson | 2013-10-30 | 1 | -0/+7 | |
| | | | | | ||||||
* | | | | | change the test to make argv a little more realistic | Aaron Patterson | 2013-10-30 | 1 | -7/+6 | |
| | | | | | ||||||
* | | | | | adding a test for the current behavior | Aaron Patterson | 2013-10-30 | 1 | -0/+18 | |
| | | | | | ||||||
* | | | | | add a test for the rc commandline option | Aaron Patterson | 2013-10-30 | 1 | -0/+18 | |
| | | | | | ||||||
* | | | | | remove useless assertions | Aaron Patterson | 2013-10-30 | 1 | -2/+0 | |
| | | | | | ||||||
* | | | | | test some of the rc specification | Aaron Patterson | 2013-10-30 | 2 | -4/+48 | |
| | | | | | ||||||
* | | | | | forgot the test, oops! | Aaron Patterson | 2013-10-30 | 1 | -0/+36 | |
| | | | | | ||||||
* | | | | | stop mutating ARGV | Aaron Patterson | 2013-10-30 | 2 | -3/+3 | |
| | | | | | ||||||
* | | | | | prepare! should return argv | Aaron Patterson | 2013-10-30 | 1 | -0/+1 | |
| | | | | | ||||||
* | | | | | rename AppPreparer | Aaron Patterson | 2013-10-30 | 4 | -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/rails | Aaron Patterson | 2013-10-30 | 12 | -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 instructions | Rafael Mendonça França | 2013-10-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | | Merge pull request #12214 from chancancode/json_decode_does_not_take_options | Jeremy Kemper | 2013-10-30 | 3 | -5/+14 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Raise an error when AS::JSON.decode is called with options | |||||
| | * | | | | | Raise an error when AS::JSON.decode is called with options | Godfrey Chan | 2013-10-30 | 3 | -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). |