aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #12481 from arunagw/fixesRafael Mendonça França2013-10-096-10/+11
|\ \ \ | | | | | | | | Few fixes which includes revert fixes
| * | | Added ActionView in rake about [ci skip]Arun Agrawal2013-10-091-5/+6
| | | |
| * | | Minor align BR tags with HTML void - with reference to the generators code ↵AvnerCohen2013-10-092-2/+2
| | | | | | | | | | | | | | | | change - https://github.com/rails/rails/commit/f038d4cc5fe1ac21f92c7e32c61ff85a0c816f3f
| * | | Using flat_map instead of map and flattenArun Agrawal2013-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | original commit 8998441967a8cfc6e4302c29664ab9d0acd77704 Reverted here ec8ef1e1055c4e1598da13f49d30261f07f4a9b4
| * | | Typo fix [ci skip]Arun Agrawal2013-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing the typo which is formed a not required link. Check here http://api.rubyonrails.org/classes/ActionController/Base.html under paramters section keeping it under tt tag gets reverted here ec8ef1e1055c4e1598da13f49d30261f07f4a9b4
| * | | observers are not part of ActiveModel [ci skip]Arun Agrawal2013-10-091-1/+1
|/ / /
* | | Merge pull request #12283 from JuanitoFatas/rails-on-rackYves Senn2013-10-091-1/+5
|\ \ \ | | | | | | | | [ci skip] Add explanation on Rack::Sendfile middleware in rails_on_rack.md.
| * | | [ci skip] Add explanation on Rack::Sendfile and fix serve static files setting.Juanito Fatas2013-10-041-1/+5
| | | |
* | | | Merge pull request #12479 from benpickles/unshift-middlewareJosé Valim2013-10-093-0/+14
|\ \ \ \ | | | | | | | | | | Expose MiddlewareStack#unshift to environment configuration
| * | | | Expose MiddlewareStack#unshift to environment configuration.Ben Pickles2013-10-093-0/+14
| | |_|/ | |/| |
* | | | add dots after `Fixes #YYYYY` in actionpack CHANGELOG. [ci skip]Yves Senn2013-10-091-12/+12
| | | |
* | | | Merge pull request #12083 from BlueHotDog/fixing_respond_withYves Senn2013-10-094-0/+25
|\ \ \ \ | | | | | | | | | | Fixing repond_with working directly on the options hash
| * | | | Fixing repond_with working directly on the options hashBlueHotDog2013-10-094-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-touchYves Senn2013-10-092-2/+6
|\ \ \ \ | |/ / / |/| | | Add documentation for after_touch [ci skip]
| * | | Add documentation for after_touch [ci skip]claudiob2013-10-082-2/+6
| | |/ | |/|
* | | :scissors:Rafael Mendonça França2013-10-092-2/+2
| | |
* | | Push define_accessors to class level since we don't need anythig fromRafael Mendonça França2013-10-083-8/+8
| | | | | | | | | | | | the instance
* | | Use the reflection name instead of the accessorRafael Mendonça França2013-10-082-1/+2
| | |
* | | Move add_counter_cache_methods to class levelRafael Mendonça França2013-10-081-2/+2
| | |
* | | Move define_constructors to class levelRafael Mendonça França2013-10-081-3/+2
| | |
* | | Move define_writers to class level since we don't need anything from theRafael Mendonça França2013-10-082-3/+3
| | | | | | | | | | | | instance
* | | Move define_readers to class method since it doesn't need nothing fromRafael Mendonça França2013-10-082-5/+3
| | | | | | | | | | | | the instance
* | | Fix the indentationRafael Mendonça França2013-10-081-12/+13
|/ /
* | join parts in `build` are *always* new, so don't bother checkingAaron Patterson2013-10-081-1/+2
| |
* | stop looking up the reflection multiple timesAaron Patterson2013-10-081-6/+5
| |
* | Merge pull request #12470 from nameisvijay/activemodel_example_fixRafael Mendonça França2013-10-081-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 exampleVijay Ubuntu2013-10-091-0/+1
| | | | | | | | | | | | similar to activerecord/examples/simple.rb
* | | cache join associations and join base on the stackAaron Patterson2013-10-081-4/+11
| | | | | | | | | | | | No reason to decompose the join objects on every iteration
* | | use the API rather than accessing underlying data structuresAaron Patterson2013-10-081-1/+1
| | |
* | | associations is always a hashAaron Patterson2013-10-081-19/+13
| | |
* | | keys are always symbolsAaron Patterson2013-10-081-2/+4
| | |
* | | we can get a list of reflections from the join parts, so let's removeAaron Patterson2013-10-081-3/+5
| | | | | | | | | | | | the @reflections ivar.
* | | transform the association input so we can avoid type checks later.Aaron Patterson2013-10-081-17/+31
| | | | | | | | | | | | | | | We should consider moving the input munging outside the class instantiation
* | | we know the keys are scalars, so avoid some typecheckingAaron Patterson2013-10-081-8/+12
| | |
* | | this method is only ever called with a reflectionAaron Patterson2013-10-081-6/+2
| | | | | | | | | | | | Stop typechecking the parameter. We know the type.
* | | don't access the reflections hashAaron Patterson2013-10-082-3/+7
| | | | | | | | | | | | The reflections hash is supposed to be private, so let's use the API.
* | | build association tree thing on demand.Aaron Patterson2013-10-081-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 classesAaron Patterson2013-10-082-17/+17
| | |
* | | decouple JoinAssociation from JoinDependencyAaron Patterson2013-10-082-10/+5
| | |
* | | @associations can never have an array, so remove the dead codeAaron Patterson2013-10-081-4/+0
| | |
* | | typecast records returned from the db rather than to_sing everythingAaron Patterson2013-10-082-12/+21
| | |
* | | Merge pull request #12463 from ulyssecarion/masterYves Senn2013-10-081-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 Carion2013-10-081-3/+9
|/ / | | | | | | It's confusing to not explicitly do this step.
* | extract the string handling part to a method.Aaron Patterson2013-10-071-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 codeAaron Patterson2013-10-071-2/+0
| | | | | | | | | | We control the inputs to `construct`, so the wrong type shouldn't be passed in ever.
* | this code is never used, remove itAaron Patterson2013-10-071-4/+0
| |
* | instrumenter can't be cached because the app could be called fromAaron Patterson2013-10-041-3/+4
| | | | | | | | different threads.
* | log the statement name along with the SQLAaron Patterson2013-10-044-6/+20
| |
* | log every sql statement, even when they errorAaron Patterson2013-10-041-25/+25
| |
* | prepare the statement inside the begin / rescue blockAaron Patterson2013-10-041-4/+4
| |