aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* remove ivars from the "protected" listAaron Patterson2015-08-261-1/+1
| | | | these ivars don't exist anymore, so we can remove them from the list
* use the content_type method on the request objectAaron Patterson2015-08-261-1/+1
| | | | | since the controller always has a request on it, we can just ask the request for the content type.
* ask the response for the statusAaron Patterson2015-08-261-3/+2
| | | | | | The controller instance always has an instance of a response object. We should store the status code on the response object so that it's only store in one place.
* remove useless conditionalAaron Patterson2015-08-261-1/+1
| | | | | We always have a response object in controller instances, so we can remove this conditional
* remove useless conditionalAaron Patterson2015-08-261-1/+1
| | | | | controller instances always have a response object, so we don't need to test to see if there is one, just always call to_a on the response.
* Merge pull request #21386 from ronakjangir47/remove_dupsRafael Mendonça França2015-08-264-4/+0
|\ | | | | Removed duplicate requires
| * Removed duplicate require ‘models/computer’Ronak Jangir2015-08-264-4/+0
| |
* | Merge pull request #21336 from yui-knk/refactor/to_use_getterRafael Mendonça França2015-08-261-7/+7
|\ \ | | | | | | Use `ActiveRecord::Migration#connection` instead of `@connection`
| * | Use `ActiveRecord::Migration#connection` instead of `@connection`yui-knk2015-08-231-7/+7
| | | | | | | | | | | | | | | `ActiveRecord::Migration` has `connetion` method so replace to use `connection` method to get `@connection` as much as possible
* | | Merge pull request #21382 from akihiro17/fix-testYves Senn2015-08-261-1/+0
|\ \ \ | | | | | | | | Fix the unused variable warning
| * | | Fix the unused variable warningakihiro172015-08-261-1/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | This fixes the following warning. ```ruby warning: assigned but unused variable - index_definition ```
* | | Merge pull request #21380 from ronakjangir47/fix_docsYves Senn2015-08-261-2/+3
|\ \ \ | |_|/ |/| | Fixed to_datetime docs [ci skip]
| * | Fixed to_datetime docs [ci skip]Ronak Jangir2015-08-261-2/+3
|/ /
* | provide a request and response to all controllersAaron Patterson2015-08-2510-39/+49
| | | | | | | | | | | | | | | | | | | | Controllers should always have a request and response when responding. Since we make this The Rule(tm), then controllers don't need to be somewhere in limbo between "asking a response object for a rack response" or "I, myself contain a rack response". This duality leads to conditionals spread through the codebase that we can delete: * https://github.com/rails/rails/blob/85a78d9358aa728298cd020cdc842b55c16f9549/actionpack/lib/action_controller/metal.rb#L221-L223
* | :snip: whitespaceAaron Patterson2015-08-251-2/+2
| |
* | Fix another rack SPEC violationAaron Patterson2015-08-251-1/+1
| |
* | rack SPEC doesn't allow `first` on the bodyAaron Patterson2015-08-251-8/+12
| | | | | | | | collect the body and make assert against the collected body
* | move response allocation to the class levelAaron Patterson2015-08-252-8/+22
| | | | | | | | | | | | we don't need an instance to figure out what type of response to allocate. Later we'll pull this up the stack and pass the response object down
* | adding a direct dispatch method to controller classesAaron Patterson2015-08-253-9/+13
| | | | | | | | This saves a lambda and request allocation on each request.
* | always dispatch to controllers the same wayAaron Patterson2015-08-253-7/+26
| | | | | | | | | | controllers should always go through the `action` class method so that their middleware is respected.
* | always return a controller class from the `controller_class` methodAaron Patterson2015-08-252-9/+14
| | | | | | | | | | now the caller can just treat it like a regular controller even though it will return a 404
* | Merge pull request #21377 from ronakjangir47/remove_mocha_active_recordKasper Timm Hansen2015-08-2512-119/+153
|\ \ | | | | | | Removed mocha from Active Record Part 1
| * | Removed mocha from Active Record Part 1Ronak Jangir2015-08-2512-119/+153
| | |
* | | Merge pull request #21368 from rodzyn/remove_mochaKasper Timm Hansen2015-08-255-163/+209
|\ \ \ | | | | | | | | Get rid of mocha tests in actionpack - part 2
| * | | Get rid of mocha tests - part 2Marcin Olichwirowicz2015-08-255-163/+209
| | | |
* | | | Merge pull request #21257 from jdantonio/async-jobKasper Timm Hansen2015-08-2513-4/+183
|\ \ \ \ | | | | | | | | | | Initial implementation of ActiveJob AsyncAdapter.
| * | | | Initial implementation of ActiveJob AsyncAdapter.Jerry D'Antonio2015-08-2513-4/+183
| | | | |
* | | | | Merge pull request #21281 from ronakjangir47/added_docsRafael Mendonça França2015-08-251-1/+10
|\ \ \ \ \ | |/ / / / |/| | | | Added docs for TimeWithZone [ci skip]
| * | | | Added docs for TimeWithZone [ci skip]Ronak Jangir2015-08-181-1/+10
| | | | |
* | | | | Merge pull request #21324 from Gaurav2728/gaurav-xml_serialization_doc_fixRafael Mendonça França2015-08-251-5/+3
|\ \ \ \ \ | | | | | | | | | | | | discard xml Serialization documentation that is no longer available […
| * | | | | discard xml Serialization documentation that is no longer available [ci skip]Gaurav Sharma2015-08-221-5/+3
| | | | | |
* | | | | | Merge pull request #21375 from rodzyn/unused_requiresRafael Mendonça França2015-08-251-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unused requires
| * | | | | | Remove unused requiresMarcin Olichwirowicz2015-08-251-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | They are already required in `actionpack/lib/action_dispatch.rb` (L25-L26)
* | | | | | | Merge pull request #21366 from amitsuroliya/remove_unused_variableRafael Mendonça França2015-08-252-13/+13
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Remove more unused block arguments
| * | | | | | Remove more unused block arguments amitkumarsuroliya2015-08-252-13/+13
| | | | | | |
* | | | | | | Merge pull request #21374 from rodzyn/protected_not_neededRafael Mendonça França2015-08-251-3/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make `assert_index` private
| * | | | | | | Make `assert_index` privateMarcin Olichwirowicz2015-08-251-3/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This `protected` keyword looks like some leftover, since we are not using explicit receiver, this should go under `private`
* | | | | | | Merge pull request #21345 from aditya-kapoor/trim-apRafael Mendonça França2015-08-252-6/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Trim out least needed controllers from AP test suite
| * | | | | | Trim out unneeded controllers from AP test suiteAditya Kapoor2015-08-242-6/+4
| | | | | | |
* | | | | | | Merge pull request #21372 from yui-knk/fix/revert_change_column_defaultSantiago Pastorino2015-08-252-8/+41
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make `change_column_default` to work
| * | | | | | | Make `change_column_default` to workyui-knk2015-08-252-8/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is fix of #20018 which removes `change_column_default` from array, so `CommandRecorder#method_missing` catches `change_column_default` and @delegate's method is called. This PR * fix this bug * define `ReversibleAndIrreversibleMethods` const making clear which this array means to prevent these miss
* | | | | | | | Merge pull request #21371 from NehaGautam/neha-remove_setRafael Mendonça França2015-08-253-3/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | remove unused require ‘set’
| * | | | | | | | remove unused require ‘set’NehaGautam2015-08-253-3/+0
| | | | | | | | |
* | | | | | | | | Fix a tiny typo [ci skip]Robin Dupret2015-08-251-1/+2
| | | | | | | | |
* | | | | | | | | A quick pass over the testing guideRobin Dupret2015-08-251-6/+11
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixtures are loaded for all the tests by default (not only model and controller tests). * Fix a few typos and improve the markup at some levels. * Wrap changes to 80 chars [ci skip]
* | | | | | | | Merge pull request #21074 from ↵Robin Dupret2015-08-251-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | vrybas/rdoc-fix-typo-belongs-to-inverse-of-class-name RDoc: fix wrong model name `:inverse_of` with `:belongs_to` [ci skip]
| * | | | | | | RDoc: fix wrong model name `:inverse_of` with `:belongs_to` [ci skip]Vladimir Rybas2015-07-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's a typo in ActiveRecord associations RDocs. Wrong `Taggable` model name, instead of `Tagging` in example of using option `:inverse_of` with `:belongs_to` association. Commit where typo was introduced: https://github.com/rails/rails/commit/91fd6510563f84ee473bb217bc63ed598abe3f24#diff-39001423802a8470dba9c931e66e101eR11 First it appears in `activerecord/CHANGELOG` in example of `:inverse_of` usage: ```ruby class Post < ActiveRecord::Base has_many :taggings has_many :tags, :through => :taggings end class Tagging < ActiveRecord::Base belongs_to :post belongs_to :tag, :inverse_of => :tagging # :inverse_of must be set! end class Tag < ActiveRecord::Base has_many :taggings has_many :posts, :through => :taggings end post = Post.first tag = post.tags.build :name => "ruby" !> tag.save # will save a Taggable linking to the post ``` The last line should be ```ruby tag.save # will save a Tagging linking to the post ``` The same typo appears in `activerecord/lib/active_record/associations.rb`. The association name is given as `:inverse_of => :taggings`, but class name is `Taggable`. ```ruby # @post = Post.first # @tag = @post.tags.build :name => "ruby" # @tag.save # !> # The last line ought to save the through record (a <tt>Taggable</tt>). This will only work if the # <tt>:inverse_of</tt> is set: # !> # class Taggable < ActiveRecord::Base # belongs_to :post !> # belongs_to :tag, :inverse_of => :taggings # end ``` This PR fixes model name.
* | | | | | | | Merge pull request #21369 from agrimm/documentation_fix_21364Yves Senn2015-08-251-2/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ci skip] Fix #21364 error in documentation about ActiveRecord::Enum
| * | | | | | | | [ci skip] Fix #21364 error in documentation about ActiveRecord::EnumAndrew Grimm2015-08-251-2/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #21094 from aditya-kapoor/add-missing-ap-testsRafael Mendonça França2015-08-251-0/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | add missing test for action regexp for routing