aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Do not point to the 5-0-stable branchRafael Mendonça França2016-09-131-1/+1
| | | | Master based applications should be pointing to master
* Merge pull request #26484 from yahonda/mysql2_ambiguous_first_argumentsRafael França2016-09-131-2/+2
|\ | | | | Address warning: ambiguous first argument
| * Address `warning: ambiguous first argument; put parentheses or a space even ↵Yasuo Honda2016-09-131-2/+2
|/ | | | after `/' operator`
* 5-0-backport: activerecord/mysql2: Avoid setting @connection to nil, just ↵Dylan Thacker-Smith2016-09-131-0/+5
| | | | | | | | | | close it (#26473) * activerecord/mysql2: Avoid setting @connection to nil, just close it Backport of https://github.com/rails/rails/pull/26434 * Add a CHANGELOG entry
* Merge pull request #26314 from frodsan/puma-ar-disconnectRichard Schneeman2016-09-131-0/+8
|\ | | | | Disconnects all connections in the pool before forking.
| * Disconnects all connections in the pool before forking.Francesco Rodriguez2016-08-291-0/+8
| | | | | | | | See discussion in https://github.com/puma/puma/issues/1001
* | Merge pull request #26466 from y-yagi/remove_duplicated_fixture_set_namesArthur Nogueira Neves2016-09-133-3/+5
|\ \ | | | | | | remove duplicated fixture set names
| * | remove duplicated fixture set namesyuuji.yaginuma2016-09-123-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If using namespaced fixtures, get following Ruby warning. ``` activerecord/lib/active_record/fixtures.rb:922: warning: method redefined; discarding old admin_foos activerecord/lib/active_record/fixtures.rb:922: warning: previous definition of admin_foos was here ``` This is happening because of the multiple set the same path when setting the fixture name. Fix to remove the duplicate path.
* | | Merge pull request #26478 from girishso/fix-guides-for-partial-render-as-optionEileen M. Uchitelle2016-09-131-7/+7
|\ \ \ | | | | | | | | fixed guide to add correct documentation for partial render 'as' option
| * | | fixed guide to add correct documentation for partial render 'as' optionGirish S2016-09-131-7/+7
|/ / /
* | | [ci skip] Update Levenshtein code with better attribution.Kasper Timm Hansen2016-09-122-2/+6
| | | | | | | | | | | | Lacks some proper creds to the homies who went the... distance ;)
* | | Merge pull request #26460 from ↵Sean Griffin2016-09-121-6/+2
|\ \ \ | | | | | | | | | | | | | | | | kamipo/remove_useless_test_string_with_crazy_column Remove useless `test_string_with_crazy_column`
| * | | Remove useless `test_string_with_crazy_column`Ryuta Kamizono2016-09-111-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | Passing `FakeColumn` was removed at #15336 therefore `test_string_with_crazy_column` is duplicated with `test_quote_string_no_column`.
* | | | Merge pull request #26434 from dylanahsmith/mysql2-no-nil-connectionArthur Nogueira Neves2016-09-123-15/+28
|\ \ \ \ | | | | | | | | | | activerecord/mysql2: Avoid setting @connection to nil, just close it
| * | | | activerecord/mysql2: Avoid setting @connection to nil, just close itDylan Thacker-Smith2016-09-083-15/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By doing `@connection = nil` that means that we need nil checks before it is used anywhere, but we weren't doing those checks. Instead, we get a NoMethodError after using a connection after it fails to reconnect. Neither of the other adapters set @connection to nil, just the mysql2 adapter. By just closing it, we avoid the need to check if we have a connection object and it will produce an appropriate exception when used.
* | | | | Merge pull request #26459 from ysksn/add_test_for_activerecord_enumEileen M. Uchitelle2016-09-124-0/+43
|\ \ \ \ \ | | | | | | | | | | | | Add tests for ActiveRecord::Enum#enum when suffix specified
| * | | | | Add tests for ActiveRecord::Enum#enum when suffix specifiedYosuke Kabuto2016-09-124-0/+43
| | |/ / / | |/| | | | | | | | | | | | | Make name of attribute medium instead of normal
* | | | | Merge pull request #26458 from kamipo/remove_unused_require_threadSantiago Pastorino2016-09-111-1/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove unused `require "thread"` in `test/cases/attribute_methods/read_test.rb`
| * | | | | Remove unused `require "thread"` in `test/cases/attribute_methods/read_test.rb`Ryuta Kamizono2016-09-111-1/+0
| |/ / / / | | | | | | | | | | | | | | | `Mutex` was removed at 8eb7561ac6e8f020ec09608532de310c6b0b8dcd.
* | | | | Merge pull request #26462 from kamipo/remove_duplicated_elsif_branchArthur Nogueira Neves2016-09-111-2/+0
|\ \ \ \ \ | |/ / / / |/| | | | Remove duplicated `elsif` branch
| * | | | Remove duplicated `elsif` branchRyuta Kamizono2016-09-111-2/+0
|/ / / / | | | | | | | | | | | | The `elsif` branch is completely duplicated with `else` branch.
* | | | Merge pull request #26449 from prathamesh-sonpatki/fixesGuillermo Iguaran2016-09-102-16/+16
|\ \ \ \ | |_|/ / |/| | | Use :git for specifying dependencies from github with https protocol
| * | | Use :git for specifying dependencies from github with https protocolPrathamesh Sonpatki2016-09-102-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | - This is required for bundler 1.13.0 because of which lot of specs are failing on Travis CI. - Similar to https://travis-ci.org/rails/rails/jobs/158905576#L559
* | | | Merge pull request #26450 from y-yagi/fix_broken_testArthur Nogueira Neves2016-09-101-0/+18
|\ \ \ \ | | | | | | | | | | use correct Gemfile in `bin/setup` test
| * | | | use correct Gemfile in `bin/setup` testyuuji.yaginuma2016-09-111-0/+18
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Currently, `bin/setup` test uses Gemfile of Rails. But this Gemfile is not a file to be used in Rails application. Add a Gemfile to Rails application that is created for test, it has been modified to use the Gemfile.
* | | | Merge pull request #26442 from kirs/action-controller-session-options-mutate1Arthur Nogueira Neves2016-09-102-1/+6
|\ \ \ \ | | | | | | | | | | Do not mutate AC::TestRequest::DEFAULT_OPTIONS
| * | | | Do not mutate AC::TestRequest::DEFAULT_OPTIONSKir Shatrov2016-09-102-1/+6
| |/ / /
* | | | Merge pull request #26454 from kamipo/remove_outdated_todo_commentRichard Schneeman2016-09-101-1/+0
|\ \ \ \ | |/ / / |/| | | Remove outdated "#TODO: Fix for binds." comment [ci skip]
| * | | Remove outdated "#TODO: Fix for binds." comment [ci skip]Ryuta Kamizono2016-09-111-1/+0
|/ / / | | | | | | | | | This comment was added at eaf5486 but already implemented.
* | | Merge pull request #26380 from kamipo/pass_set_inverse_instance_blockKasper Timm Hansen2016-09-081-2/+2
|\ \ \ | |/ / |/| | Pass `set_inverse_instance` block to `sc.execute` for `SingularAssociation`
| * | Pass `set_inverse_instance` block to `sc.execute` for `SingularAssociation`Ryuta Kamizono2016-09-031-2/+2
| | | | | | | | | | | | | | | | | | | | | Follow up to caa178c. caa178c updated all code which sets inverse instances on newly loaded associations to use block. But `SingularAssociation` was forgotten it.
* | | Merge pull request #26431 from wytesk133/masterप्रथमेश Sonpatki2016-09-081-1/+1
|\ \ \ | | | | | | | | Fix table name typos [ci skip]
| * | | Fix table name typos [ci skip]Waitaya Krongapiradee2016-09-081-1/+1
| | | |
* | | | Merge pull request #26426 from y-yagi/update_doc_about_default_cache_storeJon Moss2016-09-071-1/+1
|\ \ \ \ | | | | | | | | | | update doc about default `cache_store` [ci skip]
| * | | | update doc about default `cache_store` [ci skip]yuuji.yaginuma2016-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | The default `cache_store` has changed in 8f0e0b6 to use `file_store`.
* | | | | Merge pull request #26418 from y-yagi/fixes_26415Richard Schneeman2016-09-072-1/+8
|\ \ \ \ \ | | | | | | | | | | | | call `.to_h` to avoid using deprecated method
| * | | | | call `.to_h` to avoid using deprecated methodyuuji.yaginuma2016-09-072-1/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActionController::Parameters#merge` call `HashWithIndifferentAccess#merge`. In addition, it calls `HashWithIndifferentAccess#update` from `HashWithIndifferentAccess#merge`, where it is called the `#to_hash` of argument. But `ActionController::Parameters#to_hash` is deprecated, warning message is displayed. To avoid this, modify to convert object to `Hash`. Fixes #26415
* | | | | Merge pull request #26016 from nateberkopec/patch-1Vipul A M2016-09-071-2/+3
|\ \ \ \ \ | |/ / / / |/| | | | Clarify expires_now documentation
| * | | | Clarify expires_now documentationNate Berkopec2016-09-061-2/+3
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #26390 from Neodelf/format_mdsVipul A M2016-09-074-8/+8
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Simply formatting documents
| * | | | | [ci skip] Simply formatting documentsNeodelf2016-09-064-8/+8
| | | | | |
* | | | | | Merge pull request #26412 from rails/revert-26410-rm-dupsGuillermo Iguaran2016-09-061-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Revert " [ci skip] Remove duplicate example."
| * | | | | | Revert " [ci skip] Remove duplicate example."Vipul A M2016-09-061-0/+5
|/ / / / / /
* | | | | | Merge pull request #26410 from aditya-kapoor/rm-dupsVipul A M2016-09-061-5/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] Remove duplicate example.
| * | | | | | [ci skip] Remove duplicate example.Aditya Kapoor2016-09-061-5/+0
| | | | | | |
* | | | | | | Merge pull request #24612 from vipulnsward/fix-li-ol-widthVijay Dev2016-09-061-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Selectively add `li ul, li ol { margin:0 1.5em; }` to subColl as needed
| * | | | | | | Selectively add `li ul, li ol { margin:0 1.5em; }` to subColl needed for ↵Vipul A M2016-04-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chapters column, instead of leaking to other lists. Before: https://monosnap.com/file/CNIMXcqv3HuRrObTNYWYFis8I3G8PT After: https://monosnap.com/file/0IyEKEy9hcRCIx82etR8ikinCo3vNb Chapters column remains as is: http://take.ms/M0BkF
* | | | | | | | Merge pull request #26408 from tricknotes/bye-mongrel-from-docsVipul A M2016-09-067-9/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove the word "mongrel" from documents [ci skip]
| * | | | | | | | Remove the word "mongrel" from documentsRyunosuke Sato2016-09-077-9/+9
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently mongrel is not maintained. And it couldn't be built with any Ruby versions that supported by Rails. It is reasonable to remove the word "mongrel" in order to avoid confusion from newcomer.
* | | | | | | | Merge pull request #26405 from alexcameron89/case_statement_formattingXavier Noria2016-09-0610-113/+123
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix Remaining Case-In-Assignment Statement Formatting
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 15:05:22 +0000