Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #29362 from kamipo/remove_redundant_assert_nothing_raised | Matthew Draper | 2017-06-06 | 3 | -11/+0 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove redundant `assert_nothing_raised` before another assertions | |||||
| * | | | | | | Remove redundant `assert_nothing_raised` before another assertions | Ryuta Kamizono | 2017-06-06 | 3 | -11/+0 | |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | These `assert_nothing_raised` are covered by following assertions. | |||||
* | | | | | | Merge pull request #29370 from koic/fix_test_pluck_without_column_names_oracle | Matthew Draper | 2017-06-06 | 1 | -2/+5 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Fix `test_pluck_without_column_names` when using Oracle | |||||
| * | | | | | Fix `test_pluck_without_column_names` when using Oracle | Koichi ITO | 2017-06-06 | 1 | -2/+5 | |
| | | | | | | ||||||
* | | | | | | Let's test nokogiri 1.8 against edge Rails, and vice versa | Akira Matsuda | 2017-06-06 | 1 | -8/+8 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #29364 from lostapathy/patch-2 | Ryuta Kamizono | 2017-06-06 | 1 | -1/+0 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove html tag making markdown misrender [ci skip] | |||||
| * | | | | | | Remove html tag making markdown misrender [ci skip] | Joe Francis | 2017-06-05 | 1 | -1/+0 | |
|/ / / / / / | ||||||
* / / / / / | Fix indentation + Add backticks [ci skip] | Ryuta Kamizono | 2017-06-06 | 1 | -2/+4 | |
|/ / / / / | ||||||
* / / / / | [ci skip] UNIQUE constraint affects not only INSERT but also UPDATE | Ryuta Kamizono | 2017-06-06 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #29356 from ↵ | Eileen M. Uchitelle | 2017-06-05 | 2 | -151/+132 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | kamipo/testing_reserved_word_test_for_all_adapters Testing `ReservedWordTest` for all adapters | |||||
| * | | | | Testing `ReservedWordTest` for all adapters | Ryuta Kamizono | 2017-06-05 | 2 | -151/+132 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | `ReservedWordTest` expects that any identifiers are quoted properly. It should be tested for all adapters. | |||||
* | | | | | Remove deprecated passing of string to :if/:unless (#29357) | Joe Francis | 2017-06-06 | 1 | -1/+1 | |
|/ / / / | | | | | | | | | | | | | | | | | Other examples were removed in 53ff5fc62f9d11b6f60d371df959137f4bf40728 [ci skip] | |||||
* | | | | Merge pull request #29347 from prathamesh-sonpatki/rm-assert-nothin-raised | Eileen M. Uchitelle | 2017-06-04 | 1 | -3/+3 | |
|\ \ \ \ | | | | | | | | | | | Remove assert_nothing_raised, as test is already testing the required concerns | |||||
| * | | | | Remove assert_nothing_raised, as test is already testing the required concerns | Prathamesh Sonpatki | 2017-06-03 | 1 | -3/+3 | |
| | | | | | ||||||
* | | | | | Don't mark the schema loaded until it's really finished | Matthew Draper | 2017-06-05 | 1 | -3/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | load_schema! is overridden by attribute modules, so we need to wait until it has returned. | |||||
* | | | | | Merge pull request #29294 from gsamokovarov/attributes-default | Kasper Timm Hansen | 2017-06-04 | 39 | -150/+134 | |
|\ \ \ \ \ | | | | | | | | | | | | | Introduce mattr_accessor default option | |||||
| * | | | | | Use mattr_accessor default: option throughout the project | Genadi Samokovarov | 2017-06-03 | 36 | -125/+69 | |
| | | | | | | ||||||
| * | | | | | Implement mattr_acessor :default option | Genadi Samokovarov | 2017-06-03 | 3 | -25/+65 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #29351 from vipulnsward/unnecessary-assignment | Matthew Draper | 2017-06-04 | 1 | -3/+3 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Don't create extra assignment, just return | |||||
| * | | | | | | Don't create extra assignment, just return | Vipul A M | 2017-06-04 | 1 | -3/+3 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #29348 from andrehjr/fix-typo-route-definition-ambiguous | Matthew Draper | 2017-06-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Fix typo on error message when route definition is ambiguous. | |||||
| * | | | | | Fix typo on error message when route definition is ambiguous. | André Luis Leal Cardoso Junior | 2017-06-03 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | [ci skip] Fix typo in the system tests docs | Prathamesh Sonpatki | 2017-06-03 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | [ci skip] Add missing `be` | Prathamesh Sonpatki | 2017-06-03 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #29344 from y-yagi/fix_doc_format | Kasper Timm Hansen | 2017-06-03 | 1 | -14/+14 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix formatting of `direct` and `resolve` doc [ci skip] | |||||
| * | | | | Fix formatting of `direct` and `resolve` doc [ci skip] | yuuji.yaginuma | 2017-06-03 | 1 | -14/+14 | |
| | | | | | ||||||
* | | | | | Merge pull request #29342 from koic/change_application_js_included_in_rails_app | Matthew Draper | 2017-06-03 | 1 | -3/+3 | |
|\ \ \ \ \ | | | | | | | | | | | | | Change default application.js included in new Rails app [ci skip] | |||||
| * | | | | | Change default application.js included in new Rails app [ci skip] | Koichi ITO | 2017-06-03 | 1 | -3/+3 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #29343 from koic/remove_redundant_default_scope_tests | Matthew Draper | 2017-06-03 | 1 | -10/+0 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Remove a redundant default_scope tests | |||||
| * | | | | | Remove a redundant default_scope tests | Koichi ITO | 2017-06-03 | 1 | -10/+0 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #29340 from lucascaton/master | Matthew Draper | 2017-06-03 | 1 | -4/+14 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Make Rails welcome page responsive | |||||
| * | | | | Make Rails welcome page responsive | Lucas Caton | 2017-06-03 | 1 | -4/+14 | |
|/ / / / | ||||||
* | | | | Merge pull request #29079 from ↵ | Eileen M. Uchitelle | 2017-06-02 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | orhantoy/feature/fix-scaffold_controller-generator-usage [ci skip] Fix `scaffold_controller` generator usage | |||||
| * | | | | [ci skip] Fix `scaffold_controller` generator usage | Orhan Toy | 2017-05-29 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #29101 from ccarruitero/system_guide | Eileen M. Uchitelle | 2017-06-02 | 1 | -10/+8 | |
|\ \ \ \ \ | | | | | | | | | | | | | some typos and rephrasing in system test guide [ci skip] | |||||
| * | | | | | some typos and rephrasing in system test guide [ci skip] | Cesar Carruitero | 2017-05-16 | 1 | -10/+8 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #29135 from ↵ | Eileen M. Uchitelle | 2017-06-02 | 1 | -0/+19 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nerian/document_support_for_composite_primary_keys Document support for composite primary keys | |||||
| * | | | | | | Document support for composite primary keys | Nerian | 2017-05-18 | 1 | -0/+19 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #29282 from ↵ | Eileen M. Uchitelle | 2017-06-02 | 5 | -9/+24 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/prevent_making_bind_param_if_casted_value_is_nil Prevent making bind param if casted value is nil | |||||
| * | | | | | | | Prevent making bind param if casted value is nil | Ryuta Kamizono | 2017-05-31 | 5 | -9/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If casted value is nil, generated SQL should be `IS NULL`. But currently it is generated as `= NULL`. To prevent this behavior, avoid making bind param if casted value is nil. Fixes #28945. | |||||
* | | | | | | | | Merge pull request #29324 from koic/remove_redundant_test_find_all_with_join | Eileen M. Uchitelle | 2017-06-02 | 1 | -10/+0 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Remove the redundant `test_find_all_with_join` in AR | |||||
| * | | | | | | | | Remove the redundant `test_find_all_with_join` in AR | Koichi ITO | 2017-06-02 | 1 | -10/+0 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #29315 from mariochavez/driven_by_support_headless_drivers | Eileen M. Uchitelle | 2017-06-02 | 5 | -11/+59 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | SystemTesting::Driver can register capybara-webkit and poltergeist | |||||
| * | | | | | | | | SystemTesting::Driver can register capybara-webkit and poltergeist | Mario Alberto Chávez | 2017-06-02 | 5 | -11/+59 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers. When using `driver_by` with capybara-webkit or poltergeist, SystemTesting::Driver will register the driver while passing `screen_size` and `options` parameteres. `options` could contain any option supported by the underlying driver. | |||||
* | | | | | | | | | Merge pull request #29303 from Empact/bin-pathname | Rafael França | 2017-06-01 | 2 | -4/+2 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove the pathname dependency from bin/update and bin/setup | |||||
| * | | | | | | | | | Remove the pathname dependency from bin/update and bin/setup | Ben Woosley | 2017-05-31 | 2 | -4/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't get any benefit from it at all. | |||||
* | | | | | | | | | | Merge pull request #29314 from dskecse/replace-jquery_ujs-mention-with-rails-ujs | Kasper Timm Hansen | 2017-06-01 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | Replace an outdated mention of `jquery_ujs` with `rails-ujs` | |||||
| * | | | | | | | | | Replace an outdated mention of `jquery_ujs` with `rails-ujs` [ci skip] | Dzianis Dashkevich | 2017-06-01 | 1 | -2/+2 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #29312 from dskecse/fix-articles-layout-in-guides | Ryuta Kamizono | 2017-06-02 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix articles layout in guides by eliminating W3C validator warnings [ci skip] | |||||
| * | | | | | | | | | Fix articles layout in guides by eliminating W3C validator warnings [ci skip] | Dzianis Dashkevich | 2017-06-01 | 1 | -0/+1 | |
|/ / / / / / / / / |