Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12479 from benpickles/unshift-middleware | José Valim | 2013-10-09 | 3 | -0/+14 |
|\ | | | | | Expose MiddlewareStack#unshift to environment configuration | ||||
| * | Expose MiddlewareStack#unshift to environment configuration. | Ben Pickles | 2013-10-09 | 3 | -0/+14 |
| | | |||||
* | | add dots after `Fixes #YYYYY` in actionpack CHANGELOG. [ci skip] | Yves Senn | 2013-10-09 | 1 | -12/+12 |
| | | |||||
* | | Merge pull request #12083 from BlueHotDog/fixing_respond_with | Yves Senn | 2013-10-09 | 4 | -0/+25 |
|\ \ | | | | | | | Fixing repond_with working directly on the options hash | ||||
| * | | Fixing repond_with working directly on the options hash | BlueHotDog | 2013-10-09 | 4 | -0/+25 |
| |/ | | | | | | | | | | | | | | | This fixes an issue where the respond_with worked directly with the given options hash, so that if a user relied on it after calling respond_with, the hash wouldn't be the same. Fixes #12029 | ||||
* | | Merge pull request #12473 from claudiob/document-after-touch | Yves Senn | 2013-10-09 | 2 | -2/+6 |
|\ \ | |/ |/| | Add documentation for after_touch [ci skip] | ||||
| * | Add documentation for after_touch [ci skip] | claudiob | 2013-10-08 | 2 | -2/+6 |
| | | |||||
* | | :scissors: | Rafael Mendonça França | 2013-10-09 | 2 | -2/+2 |
| | | |||||
* | | Push define_accessors to class level since we don't need anythig from | Rafael Mendonça França | 2013-10-08 | 3 | -8/+8 |
| | | | | | | | | the instance | ||||
* | | Use the reflection name instead of the accessor | Rafael Mendonça França | 2013-10-08 | 2 | -1/+2 |
| | | |||||
* | | Move add_counter_cache_methods to class level | Rafael Mendonça França | 2013-10-08 | 1 | -2/+2 |
| | | |||||
* | | Move define_constructors to class level | Rafael Mendonça França | 2013-10-08 | 1 | -3/+2 |
| | | |||||
* | | Move define_writers to class level since we don't need anything from the | Rafael Mendonça França | 2013-10-08 | 2 | -3/+3 |
| | | | | | | | | instance | ||||
* | | Move define_readers to class method since it doesn't need nothing from | Rafael Mendonça França | 2013-10-08 | 2 | -5/+3 |
| | | | | | | | | the instance | ||||
* | | Fix the indentation | Rafael Mendonça França | 2013-10-08 | 1 | -12/+13 |
|/ | |||||
* | join parts in `build` are *always* new, so don't bother checking | Aaron Patterson | 2013-10-08 | 1 | -1/+2 |
| | |||||
* | stop looking up the reflection multiple times | Aaron Patterson | 2013-10-08 | 1 | -6/+5 |
| | |||||
* | Merge pull request #12470 from nameisvijay/activemodel_example_fix | Rafael Mendonça França | 2013-10-08 | 1 | -0/+1 |
|\ | | | | | adding load_path to include active_model in the load path of example | ||||
| * | adding load_path to include active_model in the load path of example | Vijay Ubuntu | 2013-10-09 | 1 | -0/+1 |
| | | | | | | | | similar to activerecord/examples/simple.rb | ||||
* | | cache join associations and join base on the stack | Aaron Patterson | 2013-10-08 | 1 | -4/+11 |
| | | | | | | | | No reason to decompose the join objects on every iteration | ||||
* | | use the API rather than accessing underlying data structures | Aaron Patterson | 2013-10-08 | 1 | -1/+1 |
| | | |||||
* | | associations is always a hash | Aaron Patterson | 2013-10-08 | 1 | -19/+13 |
| | | |||||
* | | keys are always symbols | Aaron Patterson | 2013-10-08 | 1 | -2/+4 |
| | | |||||
* | | we can get a list of reflections from the join parts, so let's remove | Aaron Patterson | 2013-10-08 | 1 | -3/+5 |
| | | | | | | | | the @reflections ivar. | ||||
* | | transform the association input so we can avoid type checks later. | Aaron Patterson | 2013-10-08 | 1 | -17/+31 |
| | | | | | | | | | | We should consider moving the input munging outside the class instantiation | ||||
* | | we know the keys are scalars, so avoid some typechecking | Aaron Patterson | 2013-10-08 | 1 | -8/+12 |
| | | |||||
* | | this method is only ever called with a reflection | Aaron Patterson | 2013-10-08 | 1 | -6/+2 |
| | | | | | | | | Stop typechecking the parameter. We know the type. | ||||
* | | don't access the reflections hash | Aaron Patterson | 2013-10-08 | 2 | -3/+7 |
| | | | | | | | | The reflections hash is supposed to be private, so let's use the API. | ||||
* | | build association tree thing on demand. | Aaron Patterson | 2013-10-08 | 1 | -6/+11 |
| | | | | | | | | | | `instantiate` is only called once, so there is no reason to cache the data structure on the instance and mutate itself. | ||||
* | | hide join_parts internals from other classes | Aaron Patterson | 2013-10-08 | 2 | -17/+17 |
| | | |||||
* | | decouple JoinAssociation from JoinDependency | Aaron Patterson | 2013-10-08 | 2 | -10/+5 |
| | | |||||
* | | @associations can never have an array, so remove the dead code | Aaron Patterson | 2013-10-08 | 1 | -4/+0 |
| | | |||||
* | | typecast records returned from the db rather than to_sing everything | Aaron Patterson | 2013-10-08 | 2 | -12/+21 |
| | | |||||
* | | Merge pull request #12463 from ulyssecarion/master | Yves Senn | 2013-10-08 | 1 | -3/+9 |
|\ \ | |/ |/| | Call `rails plugin new yaffle` in the plugins guide. [ci skip] | ||||
| * | Call `rails plugin new yaffle` in the plugins guide. [ci skip] | Ulysse Carion | 2013-10-08 | 1 | -3/+9 |
|/ | | | | It's confusing to not explicitly do this step. | ||||
* | extract the string handling part to a method. | Aaron Patterson | 2013-10-07 | 1 | -15/+15 |
| | | | | | | We know the structure passed in to the `construct` method will be a hash, so we don't need to test it all the time. The key value will be a symbol or string, so handle it with the special method | ||||
* | remove more dead code | Aaron Patterson | 2013-10-07 | 1 | -2/+0 |
| | | | | | We control the inputs to `construct`, so the wrong type shouldn't be passed in ever. | ||||
* | this code is never used, remove it | Aaron Patterson | 2013-10-07 | 1 | -4/+0 |
| | |||||
* | instrumenter can't be cached because the app could be called from | Aaron Patterson | 2013-10-04 | 1 | -3/+4 |
| | | | | different threads. | ||||
* | log the statement name along with the SQL | Aaron Patterson | 2013-10-04 | 4 | -6/+20 |
| | |||||
* | log every sql statement, even when they error | Aaron Patterson | 2013-10-04 | 1 | -25/+25 |
| | |||||
* | prepare the statement inside the begin / rescue block | Aaron Patterson | 2013-10-04 | 1 | -4/+4 |
| | |||||
* | rm LogIntercepter | Aaron Patterson | 2013-10-04 | 1 | -15/+0 |
| | |||||
* | stop adding singleton methods to the SQLite3 connection | Aaron Patterson | 2013-10-04 | 1 | -11/+11 |
| | |||||
* | stop adding singleton methods to the mysql2 adapter | Aaron Patterson | 2013-10-04 | 3 | -22/+22 |
| | |||||
* | stop adding singleton methods to the PG connection | Aaron Patterson | 2013-10-04 | 1 | -11/+26 |
| | |||||
* | wrap logging around the actual query call itself. | Aaron Patterson | 2013-10-04 | 2 | -50/+50 |
| | | | | This is to be consistent with the way the mysql2 adapter times queries | ||||
* | add regression test for set_inverse_instance on add_to_target | Arthur Neves | 2013-10-04 | 1 | -0/+13 |
| | |||||
* | Merge pull request #12437 from websiteswithclass/master | Rafael Mendonça França | 2013-10-04 | 1 | -6/+6 |
|\ | | | | | Fixed typo in documentation | ||||
| * | Fixed return strings in documentation | Joseph Zidell | 2013-10-03 | 1 | -3/+3 |
| | |