aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #26607 from matthewd/skip-fixture-pathMatthew Draper2016-09-242-1/+9
|\ | | | | Only search fixture_path for files that can't be found directly
| * Only search fixture_path for files that can't be found directlyMatthew Draper2016-09-242-1/+9
| | | | | | | | | | | | | | | | | | | | When passed an already-valid file name, prepending the path is likely to create problems. This is particularly relevant for #26384, which adds fixture_path handling to test classes that previously didn't have it: any existing caller must have been manually locating the file, and we don't want to break them.
* | Merge pull request #26591 from philipqnguyen/changelog-fix-etag-templateClaudio B2016-09-231-0/+8
|\ \ | |/ |/| Add #25546 and #25817 to changelog [ci skip]
| * Add #25546 and #25817 to changelog [ci skip]Philip Nguyen2016-09-231-0/+8
| |
* | Merge pull request #26605 from mjhoy/fix-controller-tests-guides-get-actionप्रथमेश Sonpatki2016-09-241-4/+4
|\ \ | | | | | | Fix docs for allowed params to `get` in controller tests [ci skip]
| * | Fix docs for allowed params to `get` in controller tests [ci skip]Michael Hoy2016-09-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #26602 Relevant method documentation: https://github.com/rails/rails/blob/abe3da9f12710ea85be69b17172bef41220037fc/actionpack/lib/action_dispatch/testing/integration.rb#L14-L43
* | | Merge pull request #25670 from tdtran/fix-nil-jsonAaron Patterson2016-09-234-1/+41
|\ \ \ | | | | | | | | Serialize JSON attribute value nil as SQL NULL, not JSON 'null'
| * | | Serialize JSON attribute value nil as SQL NULL, not JSON 'null'Trung Duc Tran2016-09-234-1/+41
|/ / / | | | | | | | | | | | | | | | Test: JSON attribute value nil can be used in where(attr: nil) Add changelog entry
* | | Merge pull request #26563 from knugie/fix_issue_26430Aaron Patterson2016-09-231-0/+1
|\ \ \ | |/ / |/| | Prevent circular require of proxy_wrappers.rb, Fixes #26430
| * | Prevent circular require of proxy_wrappers.rb, Fixes #26430Wolfgang Teuber2016-09-211-0/+1
| | |
* | | Merge pull request #26595 from prathamesh-sonpatki/fix-26593Aaron Patterson2016-09-233-4/+12
|\ \ \ | | | | | | | | Return true if attribute is not changed for update_attribute
| * | | Return true if attribute is not changed for update_attributePrathamesh Sonpatki2016-09-233-4/+12
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - If the attribute is not changed, then update_attribute does not run SQL query, this effectively means that no change was made to the attribute. - This change was made in https://github.com/rails/rails/commit/0fcd4cf5 to avoid a SQL call. - But the change resulted into `nil` being returned when there was no change in the attribute value. - This commit corrects the behavior to return true if there is no change in attribute value. This is same as previous behavior of Rails 4.2 plus benefit of no additional SQL call. - Fixes #26593.
* | | Merge pull request #26594 from y-yagi/fix_formatting_of_define_callbacksVipul A M2016-09-231-4/+4
|\ \ \ | |_|/ |/| | fix formatting of `define_callbacks` doc [ci skip]
| * | fix formatting of `define_callbacks` doc [ci skip]yuuji.yaginuma2016-09-231-4/+4
| |/ | | | | | | Single backticks don't work with rdoc.
* | Merge pull request #26589 from kirs/ad-test-request-methodArthur Nogueira Neves2016-09-222-1/+8
|\ \ | | | | | | Fix memoization bug on ActionDispatch::TestRequest#request_method=
| * | Fix memoization bug on ActionDispatch::TestRequest#request_method=Kir Shatrov2016-09-222-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TestRequest have been overrriding request_method setter since 2009, but the actual implementation in Request (not TestRequest) has been changed since that. Now it's also using @request_method instance variable to keep the state. The override in TestRequest have not been calling `super`, which caused a bug that after accessing #requst_method the value was memoized and then we've never been able to change it anymore: ``` req = ActionDispatch::TestRequest.create puts "was: #{req.request_method}" # memoized here req.request_method = "POST" puts "became: #{req.request_method}" ``` output: ``` was: GET became: GET ``` Since the whole purpose of overriding the setter in TestRequest is to upcase it, I'm changing it to `super(method.to_s.upcase)`
* | | Merge pull request #26524 from y-yagi/add_check_of_argumentRichard Schneeman2016-09-222-0/+11
|\ \ \ | |_|/ |/| | add check of argument
| * | add check of argumentyuuji.yaginuma2016-09-172-0/+11
| | | | | | | | | | | | | | | | | | | | | `#fetch_multi` in case did not cache hit, to write a cache using the block value. https://github.com/rails/rails/blob/master/activesupport/lib/active_support/cache.rb#L383..L384 Therefore, block is a need to pass always, I think should check first.
* | | Merge pull request #26562 from Neodelf/docsJon Moss2016-09-201-1/+1
|\ \ \ | | | | | | | | [ci skip] Replace to closing tag
| * | | [ci skip] Replace to closing tagAndrey Molchanov2016-09-201-1/+1
| | | |
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-09-205-8/+10
|\ \ \ \
| * | | | [ci skip] Fix wrong rdoc-ref links, the format is {}[] not []{}Prathamesh Sonpatki2016-09-141-2/+2
| | | | |
| * | | | [ci skip] Fix formatting of documentation of worker_pool method from ↵Prathamesh Sonpatki2016-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | AC::Server::Base
| * | | | [ci skip] Fix formatting in Action Cable Connection::Base module docsPrathamesh Sonpatki2016-09-071-1/+1
| | | | |
| * | | | :nail_care: [ci skip]Prathamesh Sonpatki2016-09-071-1/+1
| | | | |
| * | | | Document that redirect* don't halt exucution. We explain more on this ↵Vipul A M2016-09-061-0/+2
| | | | | | | | | | | | | | | | | | | | behavior in 2.3.2, but dont specify that is not halting. Its better to not let developers be caught by surprise. [ci skip]
| * | | | [ci fix] Fix API documentation for Streams module from Action CablePrathamesh Sonpatki2016-09-061-4/+4
| | | | |
* | | | | Merge pull request #26558 from kamipo/restore_gemfile_lock_entriesAndrew White2016-09-201-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Restore missing Gemfile.lock entries
| * | | | | Restore missing Gemfile.lock entriesRyuta Kamizono2016-09-201-0/+2
|/ / / / / | | | | | | | | | | | | | | | These lines were lost in https://github.com/rails/rails/commit/12d5c210#diff-e79a60dc6b85309ae70a6ea8261eaf95L191.
* | | | | Merge pull request #26553 from y-yagi/fix_link_to_resqueJon Moss2016-09-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | fix link to `resque` [ci skip]
| * | | | | fix link to `resque` [ci skip]yuuji.yaginuma2016-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `1-x-stable` branch does not exist, `master` is 1.x branch. Ref: http://words.steveklabnik.com/rescuing-resque-again
* | | | | | Merge pull request #26552 from rafaelfranca/fix-errors-details-storageRafael França2016-09-193-15/+32
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Always store errors details information with symbols
| * | | | | Always store errors details information with symbolsRafael Mendonça França2016-09-193-15/+32
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the association is autosaved we were storing the details with string keys. This was creating inconsistency with other details that are added using the `Errors#add` method. It was also inconsistent with the `Errors#messages` storage. To fix this inconsistency we are always storing with symbols. This will cause a small breaking change because in those cases the details could be accessed as strings keys but now it can not. The reason that we chose to do this breaking change is because `#details` should be considered a low level object like `#messages` is. Fix #26499. [Rafael Mendonça França + Marcus Vieira]
* | | | | Merge pull request #26447 from kamipo/reduce_array_allocationSantiago Pastorino2016-09-191-3/+1
|\ \ \ \ \ | | | | | | | | | | | | Reduce array allocation when `where` with passed hash
| * | | | | Reduce array allocation when `where` with passed hashRyuta Kamizono2016-09-101-3/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | In most case `where` is called with passed hash. In the case initializing `binds` is unnecessary.
* | | | | Merge pull request #26543 from y-yagi/use_rails_command_in_restart_testKasper Timm Hansen2016-09-191-7/+7
|\ \ \ \ \ | | | | | | | | | | | | use rails command in restart task test
| * | | | | use rails command in restart task testyuuji.yaginuma2016-09-191-7/+7
| | |_|_|/ | |/| | |
* | | | | Merge pull request #26448 from kamipo/remove_collection_association_uniqKasper Timm Hansen2016-09-181-1/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | | Remove unnecessry `alias uniq distinct` for collection association
| * | | | Remove unnecessry `alias uniq distinct` for collection associationRyuta Kamizono2016-09-101-1/+0
| | |/ / | |/| | | | | | | | | | `CollectionAssociation` is internal class and `uniq` is not called.
* | | | Merge pull request #26534 from Neodelf/new_branch_nameJon Moss2016-09-177-7/+7
|\ \ \ \ | | | | | | | | | | [ci skip] Fixed commas according to Oxford comma in rdoc and guides
| * | | | [ci skip] Fixed commas according to Oxford comma in rdoc and guidesAndrey Molchanov2016-09-177-7/+7
| | | | |
* | | | | Merge pull request #26446 from kamipo/rename_type_var_name_to_typeEileen M. Uchitelle2016-09-171-10/+8
|\ \ \ \ \ | | | | | | | | | | | | Rename variable name that returning `type_for` to `type` from `column`
| * | | | | Rename variable name that returning `type_for` to `type` from `column`Ryuta Kamizono2016-09-111-10/+8
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | `column_for` was changed to `type_for` to return `type` object at 36bd52b4. But variable name is still `column`. It is very confusing. Rename variable name `column` to `type` for readability.
* | | | | Merge pull request #26497 from koppen/26496-touch_with_optimistic_lockingEileen M. Uchitelle2016-09-173-1/+9
|\ \ \ \ \ | | | | | | | | | | | | Clear attribute changes after handling locking
| * | | | | Clear attribute changes after handling lockingJakob Skjerning2016-09-143-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this the changes to the lock version column will stick around even after `touch` returns. Before: model.touch model.changes # => {"lock_version"=>[0, "1"]} After: model.touch model.changes # {}
* | | | | | Merge pull request #26532 from Neodelf/new_branch_nameप्रथमेश Sonpatki2016-09-171-2/+11
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | [ci skip] Fix bad examples in rdoc
| * | | | | [ci skip] Fix bad examples in rdocAndrey Molchanov2016-09-171-2/+11
|/ / / / /
* | | | | Merge pull request #26528 from y-yagi/fix_formatting_of_fetchप्रथमेश Sonpatki2016-09-171-3/+3
|\ \ \ \ \ | | | | | | | | | | | | fix formatting of `Cache::Store#fetch` [ci skip]
| * | | | | fix formatting of `Cache::Store#fetch` [ci skip]yuuji.yaginuma2016-09-171-3/+3
| | |_|/ / | |/| | | | | | | | | | | | | Single backticks don't work with rdoc.
* | | | | Merge pull request #26523 from maclover7/jm-grammar-26382Rafael França2016-09-161-1/+2
|\ \ \ \ \ | |/ / / / |/| | | | Fix small grammar issue introduced in #26382
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 17:11:17 +0000