aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 itRobin Dupret2013-10-312-1/+1
* | Merge pull request #12107 from kares/masterRafael Mendonça França2013-10-312-5/+13
|\ \
| * | `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] 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 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 itRobin Dupret2013-10-312-1/+1
|/ / /
* | | Merge pull request #12706 from RobZolkos/masterGuillermo Iguaran2013-10-301-2/+6
|\ \ \
| * | | 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
* | | 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
* | | Merge branch 'master' of github.com:rails/railsAaron Patterson2013-10-3012-233/+257
|\ \ \
| * | | Fix release instructionsRafael Mendonça França2013-10-301-1/+1
| * | | 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 optionsGodfrey Chan2013-10-303-5/+14
| |/ / /
| * | | Merge pull request #12203 from chancancode/eager_load_jsonJeremy Kemper2013-10-308-227/+242
| |\ \ \
| | * | | Moved all JSON core extensions into core_ext/object/jsonGodfrey Chan2013-09-138-227/+242
* | | | | :cut: whitespaceAaron Patterson2013-10-301-2/+2
|/ / / /
* | | | use a thread local rather than a queue so events are in the right orderAaron Patterson2013-10-301-7/+4
* | | | no need for a CHANGELOG entry. [ci skip].Yves Senn2013-10-301-7/+1
* | | | fix code typo in `MysqlAdapter` .Closes #12647.Yves Senn2013-10-303-1/+22
| |/ / |/| |
* | | Merge pull request #12702 from dmathieu/finetune_session_fetchRafael Mendonça França2013-10-302-2/+8
|\ \ \