aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | 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
| * | | | | | | | add missing tests for action regexpAditya Kapoor2015-08-021-0/+10
| | | | | | | | |
* | | | | | | | | Merge pull request #21365 from justanshulsharma/remove_unused_variableRafael Mendonça França2015-08-252-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove unused block arguments
| * | | | | | | | | Remove unused block argumentsAnshul Sharma2015-08-252-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #21363 from amitsuroliya/remove_unused_variableRafael Mendonça França2015-08-241-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove unused block arguments
| * | | | | | | | | Remove unused block argumentsamitkumarsuroliya2015-08-251-1/+1
|/ / / / / / / / /
* | | | | | | | | use `caller_locations` instead of `caller`Aaron Patterson2015-08-242-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have `caller_locations`, so we don't need to parse the strings in the callstack.
* | | | | | | | | remove more direct `env` mutationsAaron Patterson2015-08-242-2/+4
| | | | | | | | |
* | | | | | | | | remove another `@env` accessAaron Patterson2015-08-241-1/+1
| | | | | | | | |
* | | | | | | | | remove more direct access to `env`Aaron Patterson2015-08-242-3/+4
| | | | | | | | |
* | | | | | | | | fewer calls to `env`Aaron Patterson2015-08-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to directly access the env hash
* | | | | | | | | Merge pull request #21361 from olleicua/masterRafael Mendonça França2015-08-241-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | minor documentation improvement [ci skip]
| * | | | | | | | | minor documentation improvement [ci skip]Sam Auciello2015-08-241-2/+2
| | | | | | | | | |
* | | | | | | | | | override `controller_class` on the requestAaron Patterson2015-08-241-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just like the other places. We need to refactor this because the code is almost identical to that in the action pack tests
* | | | | | | | | | stop using `@env` in the GET / POST methodsAaron Patterson2015-08-242-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I want to implement this with something besides `@env` in the future, so lets stop directly referencing it.
* | | | | | | | | | rm useless methodAaron Patterson2015-08-241-4/+0
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | superclass already has this method, so remove this one
* | | | | | | | | remove dead code :bomb:Aaron Patterson2015-08-241-2/+0
| | | | | | | | |
* | | | | | | | | pull up dispatcher allocationAaron Patterson2015-08-242-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the dispatcher class isn't configurable anymore, so pull up allocation to the method that needs it.
* | | | | | | | | directly ask the request for the controller classAaron Patterson2015-08-241-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we don't have subclasses depending on this method (they augment the request class instead of the dispatch class) we can remove this method and directly ask the request object for the controller class
* | | | | | | | | use `make_set` helper method to generate route setsAaron Patterson2015-08-241-31/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should keep the route set generation logic in one place
* | | | | | | | | remove useless ivarAaron Patterson2015-08-241-2/+1
| | | | | | | | |
* | | | | | | | | remove setter for the dispatcher classAaron Patterson2015-08-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we don't need it anymore. We always use the same dispatcher in tests.
* | | | | | | | | subclass and delegate rather than mutating existing objectsAaron Patterson2015-08-241-12/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we subclass and augment the superclass, then we don't need to have setters for particular things on the superclass.
* | | | | | | | | Merge pull request #21359 from Gaurav2728/gaurav-remove_unused_require_fileRafael Mendonça França2015-08-242-3/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | temp files are no more require
| * | | | | | | | | temp files are no more requireGaurav Sharma2015-08-252-3/+0
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | `:nail_care:`
* | | | | | | | | use a custom request class to determine the controller classAaron Patterson2015-08-242-25/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | controller class resolution has been moved to the request object, so we should override that method instead of relying on the RouteSet to generate the controller class.
* | | | | | | | | Pass the correct formatsRafael Mendonça França2015-08-241-2/+2
| | | | | | | | |
* | | | | | | | | Pass formats to lookup_contextRafael Mendonça França2015-08-242-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we were changing the state of the lookup_context for the duration of the with_layout_format block, but since we already know the formats we can just pass it explicitly. Related with 8d7ce0f22aee09d20091a4dc58cb379a09d13e26
* | | | | | | | | Allow release when CHANGELOG is changedRafael Mendonça França2015-08-241-1/+1
| | | | | | | | |
* | | | | | | | | remove useless case in #resolve_layout.Nick Sutterer2015-08-241-2/+0
| | | | | | | | |
* | | | | | | | | remove LookupContext#with_layout_format by passing formats for layouts ↵Nick Sutterer2015-08-243-24/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | explicitely.
* | | | | | | | | Merge pull request #21354 from yui-knk/fix/migration_file_timestampRobin Dupret2015-08-242-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [ci skip] Fix migration file's timestamp
| * | | | | | | | | [ci skip] Fix migration file's timestampyui-knk2015-08-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In rails generally migration file's timestamp is "YYYYMMDDHHMMSS".
* | | | | | | | | | Merge pull request #21339 from deepj/unused-block-argumentsCarlos Antonio da Silva2015-08-242-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Remove unused block arguments
| * | | | | | | | | | Remove unused block argumentsdeepj2015-08-232-3/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #21355 from akihiro17/remove-variablesRafael Mendonça França2015-08-241-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove unused variables
| * | | | | | | | | | | Remove unused variablesakihiro172015-08-241-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #21342 from yui-knk/test/add_assert_methodRafael Mendonça França2015-08-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | Add `assert_nothing_raised` to make clear test case perpose
| * | | | | | | | | | | Add `assert_nothing_raised` to make clear test case perposeyui-knk2015-08-231-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #21267 from davidcornu/rails-server-port-env-varRafael Mendonça França2015-08-243-1/+12
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use the PORT environment variable for rails server
| * | | | | | | | | | | Use the PORT environment variable for rails serverDavid Cornu2015-08-183-1/+12
| | | | | | | | | | | |
* | | | | | | | | | | | Further fix failing tests caused by #21350Sean Griffin2015-08-241-0/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Fix failing tests caused by #21350Sean Griffin2015-08-241-0/+1
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |