aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | |
* | | | | Merge pull request #21350 from agis-/issue-21223Sean Griffin2015-08-246-1/+18
|\ \ \ \ \ | | | | | | | | | | | | Only nullify persisted has_one target associations
| * | | | | Only nullify persisted has_one target associationsAgis-2015-08-246-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since after 87d1aba3c `dependent: :destroy` callbacks on has_one assocations run *after* destroy, it is possible that a nullification is attempted on an already destroyed target: class Car < ActiveRecord::Base has_one :engine, dependent: :nullify end class Engine < ActiveRecord::Base belongs_to :car, dependent: :destroy end > car = Car.create! > engine = Engine.create!(car: car) > engine.destroy! # => ActiveRecord::ActiveRecordError: cannot update a > destroyed record In the above case, `engine.destroy!` deletes `engine` and *then* triggers the deletion of `car`, which in turn triggers a nullification of `engine.car_id`. However, `engine` is already destroyed at that point. Fixes #21223.
* | | | | | Merge pull request #21091 from ↵Yves Senn2015-08-241-0/+32
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | y-yagi/add_activejob_section_to_instrumentation_guide add Active Job section to instrumentation guide [ci skip]
| * | | | | add Active Job section to instrumentation guide [ci skip]yuuji.yaginuma2015-08-021-0/+32
| | | | | |
* | | | | | Merge pull request #21321 from rodzyn/removing_mochaKasper Timm Hansen2015-08-2410-78/+103
|\ \ \ \ \ \ | | | | | | | | | | | | | | Get rid of mocha tests in actionpack - part 1
| * | | | | | Get rid of mocha tests - part 1Marcin Olichwirowicz2015-08-2410-78/+103
| | | | | | |
* | | | | | | Merge pull request #21320 from piton4eg/patch-8Yves Senn2015-08-241-7/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Small fixes [ci skip]
| * | | | | | | Fix docs for debugging [ci skip]:Alexey Markov2015-08-241-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix command list for thread * add omitted end of code * fix description for `continue` and `finish` command
* | | | | | | | guides, move incomplete example to corresponding option. #21349Yves Senn2015-08-241-2/+4
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] This example is dependent on the `:end_at` option and has been removed from `4-2-stable` (d167b811520a6f800b86c77b805d15505a251bb8)
* | | | | | | Merge pull request #21347 from ronakjangir47/remove_mocha_actionviewKasper Timm Hansen2015-08-248-81/+105
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Removed Mocha from ActionView part 1
| * | | | | | | Removed Mocha from ActionView part 1Ronak Jangir2015-08-248-81/+105
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'master' of github.com:rails/railsVijay Dev2015-08-24456-4925/+7457
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/security.md
| * \ \ \ \ \ \ Merge pull request #21348 from yui-knk/fix/about_comma_style_2Vijay Dev2015-08-241-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | [ci skip] Fix the grammar
| | * | | | | | [ci skip] Fix the grammaryui-knk2015-08-241-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | This is discussed on https://github.com/rails/rails/pull/21334
| * | | | | | use methods on the request object instead of accessing envAaron Patterson2015-08-231-7/+7
| | | | | | |
| * | | | | | use `Request#path_info` instead of direct ENV accessAaron Patterson2015-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we already have a request, so we should use the methods on the request to access the path info information
| * | | | | | remove env access from debug_exceptionsAaron Patterson2015-08-231-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates fewer request objects and helps to abstract away from internals
| * | | | | | remove more `env` accessAaron Patterson2015-08-231-11/+19
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 02:45:53 +0000