aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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).
| * | Merge pull request #12203 from chancancode/eager_load_jsonJeremy Kemper2013-10-308-227/+242
| |\ \ | | | | | | | | Eagerload active_support/json/encoding in active_support/core_ext/object/to_json
| | * | Moved all JSON core extensions into core_ext/object/jsonGodfrey Chan2013-09-138-227/+242
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TL;DR The primary driver is to remove autoload surprise. This is related to #12106. (The root cause for that ticket is that json/add defines Regexp#to_json among others, but here I'll reproduce the problem without json/add.) Before: >> require 'active_support/core_ext/to_json' => true >> //.as_json NoMethodError: undefined method `as_json' for //:Regexp from (irb):3 from /Users/godfrey/.rvm/rubies/ruby-2.0.0-p195/bin/irb:16:in `<main>' >> //.to_json => "\"(?-mix:)\"" >> //.as_json => "(?-mix:)" After: >> require 'active_support/core_ext/to_json' => true >> //.as_json => "(?-mix:)" This is because ActiveSupport::JSON is autoloaded the first time Object#to_json is called, which causes additional core extentions (previously defined in active_support/json/encoding.rb) to be loaded. When someone require 'active_support/core_ext', the expectation is that it would add certain methods to the core classes NOW. The previous behaviour causes additional methods to be loaded the first time you call `to_json`, which could cause nasty surprises and other unplesant side-effects. This change moves all core extensions in to core_ext/json. AS::JSON is still autoloaded on first #to_json call, but since it nolonger include the core extensions, it should address the aforementioned bug. *Requiring core_ext/object/to_json now causes a deprecation warnning*
* | | | :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
|\ \ | | | | | | session#fetch doesn't behave exactly like Hash#fetch.
| * | session#fetch doesn't behave exactly like Hash#fetch.Damien Mathieu2013-10-302-2/+8
|/ / | | | | | | | | | | | | | | | | Mention it in the changelog and add a test checking for regressions. Hash#fetch isn't adding the defaultly returned value. However, in the session, saving it is the behavior we should expect. See discussion in #12692
* | Merge pull request #12687 from notalex/masterYves Senn2013-10-301-7/+12
|\ \ | | | | | | Update pull request instructions as per the new Github UI [ci skip]
| * | Update pull request instructions as per the new Github UIAlex Johnson2013-10-301-7/+12
|/ / | | | | | | [ci skip]
* | Merge pull request #12653 from releu/short_arrays_in_inspectYves Senn2013-10-303-3/+19
|\ \ | | | | | | Short arrays in record.inspect
| * | short arrays in inspectJan Bernacki2013-10-303-3/+19
|/ /
* | Merge pull request #12692 from dmathieu/session_fetchGuillermo Iguaran2013-10-293-0/+37
|\ \ | | | | | | Add session#fetch
| * | add the fetch method to sessionsDamien Mathieu2013-10-293-0/+37
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 15:26:26 +0000