aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ci skip] Replace to closing tagAndrey Molchanov2016-09-201-1/+1
|
* 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
| * | | Fix small grammar issue introduced in #26382Jon Moss2016-09-161-1/+2
|/ / / | | | | | | | | | [ci skip]
* | | Merge pull request #26516 from grosser/grosser/assertRafael França2016-09-1675-362/+362
|\ \ \ | | | | | | | | improve error message when include assertions fail
| * | | improve error message when include assertions failMichael Grosser2016-09-1675-362/+362
| | | | | | | | | | | | | | | | | | | | | | | | assert [1, 3].includes?(2) fails with unhelpful "Asserting failed" message assert_includes [1, 3], 2 fails with "Expected [1, 3] to include 2" which makes it easier to debug and more obvious what went wrong
* | | | Merge pull request #26514 from louim/patch-1Rafael França2016-09-161-8/+8
|\ \ \ \ | | | | | | | | | | Update ActiveModel::Dirty Doc to be simpler to understand
| * | | | Update ActiveModel::Dirty Doc [ci skip]Louis-Michel Couture2016-09-161-8/+8
| |/ / /
* | | | Merge pull request #26509 from claudiob/rename-asRafael França2016-09-161-1/+1
|\ \ \ \ | | | | | | | | | | Rename test to match what it does
| * | | | Rename test to match what it doesclaudiob2016-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit d270da569 changed the `form_for` API from `:object_name` to `:as`. It also change the related test body, but not its title, which is changed here. See https://github.com/rails/rails/commit/d270da569efeabd7cd563028816452236713aa9f#diff-52455f1e82acf12551bc5e7e26b82008 I realize this is a small commit but I was having trouble understanding what the test was about since there is no "object_name" in the code. I imagine the same may happen to other developers, therefore this commit.
* | | | | Merge pull request #26507 from Neodelf/actionview_duplicateRafael França2016-09-162-6/+2
|\ \ \ \ \ | |_|/ / / |/| | | | DRYing duplicate methods
| * | | | DRYing duplicate methodsAndrey Molchanov2016-09-162-6/+2
| | | | |
* | | | | Force correct namespace when using TransactionManagerArthur Neves2016-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | [fixes #26441]
* | | | | Merge pull request #26510 from y-yagi/fix_typo_in_add_column_docJon Moss2016-09-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | fix typo in `add_column` doc [ci skip]
| * | | | | fix typo in `add_column` doc [ci skip]yuuji.yaginuma2016-09-161-1/+1
| | | | | |
* | | | | | Merge pull request #26508 from louim/patch-1Jon Moss2016-09-151-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Update ActiveModel::Dirty Doc [ci skip]
| * | | | | Update ActiveModel::Dirty Doc [ci skip]Louis-Michel Couture2016-09-151-1/+1
|/ / / / / | | | | | | | | | | Fix potentially misleading example.
* | | | | bug report template for migrations (#26488)Girish Sonawane2016-09-153-0/+130
| | | | | | | | | | | | | | | * added bug report template for migrations
* | | | | Merge pull request #26469 from y-yagi/remove_useless_optionRafael França2016-09-141-5/+0
|\ \ \ \ \ | | | | | | | | | | | | remove useless `gemfile` option
| * | | | | remove useless `gemfile` optionyuuji.yaginuma2016-09-121-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails application for test creates with `--skip-gemfile` option. https://github.com/rails/rails/blob/master/railties/test/isolation/abstract_unit.rb#L333 Therefore, regardless of the option, Gemfile is not created.
* | | | | | Merge pull request #26498 from FriedSock/correct-render-text-deprecation-messageRafael França2016-09-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Correct `render text:` deprecation message
| * | | | | | Correct `render text:` deprecation messageJack Bracewell2016-09-141-1/+1
| | |_|_|/ / | |/| | | | | | | | | | The default Content-Type is `text/html`, not `text/plain`.
* | | | | | Merge pull request #26477 from kirs/action_dispatch-assert_responseRafael França2016-09-142-2/+29
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Improve assert_response helper
| * | | | | Improve assert_response helperKir Shatrov2016-09-142-2/+29
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the check is failed, print the actual response body if it's not too large. This could improve productivity when writing new tests. Before: ``` ThemeEditorIntegrationTest#test_whatever Expected response to be a <200: ok>, but was a <422: Unprocessable Entity>. Expected: 200 Actual: 422 ``` After: ``` ThemeEditorIntegrationTest#test_whatever Expected response to be a <200: ok>, but was a <422: Unprocessable Entity>. Expected: 200 Actual: 422 Response body: {"errors":["Invalid settings object for section '1'"]} ```
* | | | | Merge pull request #26487 from prathamesh-sonpatki/move-preload-section-upRichard Schneeman2016-09-141-7/+8
|\ \ \ \ \ | | | | | | | | | | | | Move comment about disconnecting pool close to comment about preload
| * | | | | Move comment about disconnecting pool close to comment about preloadPrathamesh Sonpatki2016-09-141-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | - These two comments are connected to each other so kept them back to back.
* | | | | | Merge pull request #26486 from y-yagi/fix_broken_testRafael França2016-09-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix broken generators test
| * | | | | | fix broken generators testyuuji.yaginuma2016-09-142-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | Follow up to 92703a9ea5d8b96f30e0b706b801c9185ef14f0e
* | | | | | Fix test for the edge generatorRafael Mendonça França2016-09-141-1/+1
| | | | | |
* | | | | | Override the github git source instead of changing manually all entriesRafael Mendonça França2016-09-142-62/+68
| |_|_|/ / |/| | | |
* | | | | Merge pull request #26489 from kamipo/fix_broken_comments_indentationXavier Noria2016-09-1467-1665/+1670
|\ \ \ \ \ | |/ / / / |/| | | | Fix broken comments indentation caused by rubocop auto-correct [ci skip]
| * | | | Fix broken comments indentation caused by rubocop auto-correct [ci skip]Ryuta Kamizono2016-09-1467-1665/+1670
|/ / / / | | | | | | | | | | | | | | | | | | | | All indentation was normalized by rubocop auto-correct at 80e66cc4d90bf8c15d1a5f6e3152e90147f00772. But comments was still kept absolute position. This commit aligns comments with method definitions for consistency.
* | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 01:40:08 +0000