Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow release when CHANGELOG is changed | Rafael Mendonça França | 2015-08-24 | 1 | -1/+1 |
| | |||||
* | remove useless case in #resolve_layout. | Nick Sutterer | 2015-08-24 | 1 | -2/+0 |
| | |||||
* | remove LookupContext#with_layout_format by passing formats for layouts ↵ | Nick Sutterer | 2015-08-24 | 3 | -24/+11 |
| | | | | explicitely. | ||||
* | Merge pull request #21354 from yui-knk/fix/migration_file_timestamp | Robin Dupret | 2015-08-24 | 2 | -2/+2 |
|\ | | | | | [ci skip] Fix migration file's timestamp | ||||
| * | [ci skip] Fix migration file's timestamp | yui-knk | 2015-08-24 | 2 | -2/+2 |
| | | | | | | | | In rails generally migration file's timestamp is "YYYYMMDDHHMMSS". | ||||
* | | Merge pull request #21339 from deepj/unused-block-arguments | Carlos Antonio da Silva | 2015-08-24 | 2 | -3/+3 |
|\ \ | | | | | | | Remove unused block arguments | ||||
| * | | Remove unused block arguments | deepj | 2015-08-23 | 2 | -3/+3 |
| | | | |||||
* | | | Merge pull request #21355 from akihiro17/remove-variables | Rafael Mendonça França | 2015-08-24 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Remove unused variables | ||||
| * | | | Remove unused variables | akihiro17 | 2015-08-24 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #21342 from yui-knk/test/add_assert_method | Rafael Mendonça França | 2015-08-24 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Add `assert_nothing_raised` to make clear test case perpose | ||||
| * | | | | Add `assert_nothing_raised` to make clear test case perpose | yui-knk | 2015-08-23 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #21267 from davidcornu/rails-server-port-env-var | Rafael Mendonça França | 2015-08-24 | 3 | -1/+12 |
|\ \ \ \ | | | | | | | | | | | Use the PORT environment variable for rails server | ||||
| * | | | | Use the PORT environment variable for rails server | David Cornu | 2015-08-18 | 3 | -1/+12 |
| | | | | | |||||
* | | | | | Further fix failing tests caused by #21350 | Sean Griffin | 2015-08-24 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Fix failing tests caused by #21350 | Sean Griffin | 2015-08-24 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #21350 from agis-/issue-21223 | Sean Griffin | 2015-08-24 | 6 | -1/+18 |
|\ \ \ \ \ | | | | | | | | | | | | | Only nullify persisted has_one target associations | ||||
| * | | | | | Only nullify persisted has_one target associations | Agis- | 2015-08-24 | 6 | -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 Senn | 2015-08-24 | 1 | -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.yaginuma | 2015-08-02 | 1 | -0/+32 |
| | | | | | | |||||
* | | | | | | Merge pull request #21321 from rodzyn/removing_mocha | Kasper Timm Hansen | 2015-08-24 | 10 | -78/+103 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Get rid of mocha tests in actionpack - part 1 | ||||
| * | | | | | | Get rid of mocha tests - part 1 | Marcin Olichwirowicz | 2015-08-24 | 10 | -78/+103 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #21320 from piton4eg/patch-8 | Yves Senn | 2015-08-24 | 1 | -7/+8 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Small fixes [ci skip] | ||||
| * | | | | | | | Fix docs for debugging [ci skip]: | Alexey Markov | 2015-08-24 | 1 | -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. #21349 | Yves Senn | 2015-08-24 | 1 | -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_actionview | Kasper Timm Hansen | 2015-08-24 | 8 | -81/+105 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Removed Mocha from ActionView part 1 | ||||
| * | | | | | | | Removed Mocha from ActionView part 1 | Ronak Jangir | 2015-08-24 | 8 | -81/+105 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'master' of github.com:rails/rails | Vijay Dev | 2015-08-24 | 456 | -4925/+7457 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/security.md | ||||
| * \ \ \ \ \ \ | Merge pull request #21348 from yui-knk/fix/about_comma_style_2 | Vijay Dev | 2015-08-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | [ci skip] Fix the grammar | ||||
| | * | | | | | | [ci skip] Fix the grammar | yui-knk | 2015-08-24 | 1 | -1/+1 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | This is discussed on https://github.com/rails/rails/pull/21334 | ||||
| * | | | | | | use methods on the request object instead of accessing env | Aaron Patterson | 2015-08-23 | 1 | -7/+7 |
| | | | | | | | |||||
| * | | | | | | use `Request#path_info` instead of direct ENV access | Aaron Patterson | 2015-08-23 | 1 | -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_exceptions | Aaron Patterson | 2015-08-23 | 1 | -10/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates fewer request objects and helps to abstract away from internals | ||||
| * | | | | | | remove more `env` access | Aaron Patterson | 2015-08-23 | 1 | -11/+19 |
| | | | | | | | |||||
| * | | | | | | remove more env access | Aaron Patterson | 2015-08-23 | 1 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | remove more env access | Aaron Patterson | 2015-08-23 | 1 | -4/+6 |
| | | | | | | | |||||
| * | | | | | | convert more `@env` access to get / set header | Aaron Patterson | 2015-08-23 | 2 | -12/+14 |
| | | | | | | | |||||
| * | | | | | | remove usage of `@env` | Aaron Patterson | 2015-08-23 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | try to remove dependencies on `@env` so we can have more flexible internals | ||||
| * | | | | | | Merge pull request #21341 from yui-knk/fix/ar_test_remove_innermethod | Yves Senn | 2015-08-23 | 1 | -5/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove test helper method to inside test method | ||||
| | * | | | | | | Remove test helper method to inside test method | yui-knk | 2015-08-23 | 1 | -5/+1 |
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove `MigrationTest#connection` and write `ActiveRecord::Base.connection` directly to test, because `MigrationTest#connection` is only used in `test_migration_instance_has_connection`. | ||||
| * | | | | | | Merge pull request #21340 from ronakjangir47/request_object | Yves Senn | 2015-08-23 | 1 | -3/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Another place to use a request object in NullSessionHash | ||||
| | * | | | | | | Another place to use a request object in NullSessionHash | Ronak Jangir | 2015-08-23 | 1 | -3/+3 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | May be missed in 5fe141638f1243ac6ae187ae14aa398b4c1875a2 commit Also fixes the broken build | ||||
| * | | | | | | Merge pull request #21343 from shunsukeaida/remove_broken_link | Arun Agrawal | 2015-08-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove a link to the site that seems to be gone. [ci skip] | ||||
| | * | | | | | | Remove a link to the site that seems to be gone. [ci skip] | shunsukeaida | 2015-08-23 | 1 | -1/+1 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | Followup to #20637. | ||||
| * | | | | | | Merge pull request #21332 from ronakjangir47/take_docs | Eileen M. Uchitelle | 2015-08-23 | 1 | -0/+25 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Added docs for CollectionProxy#take | ||||
| | * | | | | | Added docs for CollectionProxy#take [ci skip] | Ronak Jangir | 2015-08-23 | 1 | -0/+25 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #21338 from y-yagi/fix_strip_links_example | Abdelkader Boudih | 2015-08-23 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | fix syntax error in strip_links example [ci skip] | ||||
| | * | | | | | | fix syntax error in strip_links example [ci skip] | yuuji.yaginuma | 2015-08-23 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can not use double quotes in double quoted string without escape | ||||
| * | | | | | | | Merge pull request #21335 from yui-knk/refactor/remove_not_used_block_arg | Yves Senn | 2015-08-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | Remove not used a block argument (`&block`) | ||||
| | * | | | | | | Remove not used a block argument (`&block`) | yui-knk | 2015-08-23 | 1 | -1/+1 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #21334 from yui-knk/doc/about_comma_style | Richard Schneeman | 2015-08-22 | 1 | -0/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | [ci skip] Add style guide about comma |