aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #29294 from gsamokovarov/attributes-defaultKasper Timm Hansen2017-06-0439-150/+134
|\ | | | | Introduce mattr_accessor default option
| * Use mattr_accessor default: option throughout the projectGenadi Samokovarov2017-06-0336-125/+69
| |
| * Implement mattr_acessor :default optionGenadi Samokovarov2017-06-033-25/+65
| |
* | Merge pull request #29351 from vipulnsward/unnecessary-assignmentMatthew Draper2017-06-041-3/+3
|\ \ | | | | | | Don't create extra assignment, just return
| * | Don't create extra assignment, just returnVipul A M2017-06-041-3/+3
|/ /
* | Merge pull request #29348 from andrehjr/fix-typo-route-definition-ambiguousMatthew Draper2017-06-041-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 Junior2017-06-031-1/+1
|/ /
* | [ci skip] Fix typo in the system tests docsPrathamesh Sonpatki2017-06-031-1/+1
| |
* | [ci skip] Add missing `be`Prathamesh Sonpatki2017-06-031-1/+1
| |
* | Merge pull request #29344 from y-yagi/fix_doc_formatKasper Timm Hansen2017-06-031-14/+14
|\ \ | |/ |/| Fix formatting of `direct` and `resolve` doc [ci skip]
| * Fix formatting of `direct` and `resolve` doc [ci skip]yuuji.yaginuma2017-06-031-14/+14
| |
* | Merge pull request #29342 from koic/change_application_js_included_in_rails_appMatthew Draper2017-06-031-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 ITO2017-06-031-3/+3
| | |
* | | Merge pull request #29343 from koic/remove_redundant_default_scope_testsMatthew Draper2017-06-031-10/+0
|\ \ \ | |/ / |/| | Remove a redundant default_scope tests
| * | Remove a redundant default_scope testsKoichi ITO2017-06-031-10/+0
|/ /
* | Merge pull request #29340 from lucascaton/masterMatthew Draper2017-06-031-4/+14
|\ \ | |/ |/| Make Rails welcome page responsive
| * Make Rails welcome page responsiveLucas Caton2017-06-031-4/+14
|/
* Merge pull request #29079 from ↵Eileen M. Uchitelle2017-06-021-1/+1
|\ | | | | | | | | orhantoy/feature/fix-scaffold_controller-generator-usage [ci skip] Fix `scaffold_controller` generator usage
| * [ci skip] Fix `scaffold_controller` generator usageOrhan Toy2017-05-291-1/+1
| |
* | Merge pull request #29101 from ccarruitero/system_guideEileen M. Uchitelle2017-06-021-10/+8
|\ \ | | | | | | some typos and rephrasing in system test guide [ci skip]
| * | some typos and rephrasing in system test guide [ci skip]Cesar Carruitero2017-05-161-10/+8
| | |
* | | Merge pull request #29135 from ↵Eileen M. Uchitelle2017-06-021-0/+19
|\ \ \ | | | | | | | | | | | | | | | | Nerian/document_support_for_composite_primary_keys Document support for composite primary keys
| * | | Document support for composite primary keysNerian2017-05-181-0/+19
| | | |
* | | | Merge pull request #29282 from ↵Eileen M. Uchitelle2017-06-025-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 nilRyuta Kamizono2017-05-315-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_joinEileen M. Uchitelle2017-06-021-10/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove the redundant `test_find_all_with_join` in AR
| * | | | | Remove the redundant `test_find_all_with_join` in ARKoichi ITO2017-06-021-10/+0
| | | | | |
* | | | | | Merge pull request #29315 from mariochavez/driven_by_support_headless_driversEileen M. Uchitelle2017-06-025-11/+59
|\ \ \ \ \ \ | |/ / / / / |/| | | | | SystemTesting::Driver can register capybara-webkit and poltergeist
| * | | | | SystemTesting::Driver can register capybara-webkit and poltergeistMario Alberto Chávez2017-06-025-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-pathnameRafael França2017-06-012-4/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove the pathname dependency from bin/update and bin/setup
| * | | | | | Remove the pathname dependency from bin/update and bin/setupBen Woosley2017-05-312-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't get any benefit from it at all.
* | | | | | | Merge pull request #29314 from dskecse/replace-jquery_ujs-mention-with-rails-ujsKasper Timm Hansen2017-06-011-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 Dashkevich2017-06-011-2/+2
|/ / / / / /
* | | | | | Merge pull request #29312 from dskecse/fix-articles-layout-in-guidesRyuta Kamizono2017-06-021-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 Dashkevich2017-06-011-0/+1
|/ / / / / /
* | | | | | Merge pull request #29308 from koic/correct_a_has_many_association_testMatthew Draper2017-06-022-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Correct a has_many association test
| * | | | | | Correct a has_many association testKoichi ITO2017-06-012-1/+2
| |/ / / / /
* | | | | | Merge pull request #27413 from kamipo/simplify_assert_no_match_regexMatthew Draper2017-06-021-14/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Simplify `assert_no_match %r{colname.*limit:}` regex
| * | | | | | Simplify `assert_no_match %r{colname.*limit:}` regexRyuta Kamizono2017-06-011-14/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | In `test_schema_dump_includes_limit_constraint_for_integer_columns`, unified `assert_match` and `assert_no_match` to simple regex.
* | | | | | Merge pull request #29220 from kamipo/consolidate_database_specific_json_typesMatthew Draper2017-06-0111-101/+122
|\ \ \ \ \ \ | | | | | | | | | | | | | | Consolidate database specific JSON types to `Type::Json`
| * | | | | | Consolidate database specific JSON types to `Type::Json`Ryuta Kamizono2017-05-3011-101/+122
| | | | | | |
* | | | | | | Merge pull request #29293 from kamipo/fix_sti_with_default_scopeMatthew Draper2017-06-012-2/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix `default_scoped` with defined `default_scope` on STI model
| * | | | | | | Fix `default_scoped` with defined `default_scope` on STI modelRyuta Kamizono2017-05-312-2/+11
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This regression is caused by d1249c1. If STI model is defined `default_scope`, `base_rel` is not respected. I fixed to merge `base_rel` in that case.
* | | | | | | Merge pull request #29304 from kamipo/should_use_quote_for_string_literalMatthew Draper2017-06-011-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Should use `quote` for a string literal
| * | | | | | Should use `quote` for a string literalRyuta Kamizono2017-06-011-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up of #29077. Before: ```sql SELECT sql FROM sqlite_master WHERE tbl_name NOT IN ("foo") ORDER BY tbl_name, type DESC, name ``` After: ```sql SELECT sql FROM sqlite_master WHERE tbl_name NOT IN ('foo') ORDER BY tbl_name, type DESC, name ``` > If a keyword in double quotes (ex: "key" or "glob") is used in a context where it cannot be resolved to an identifier but where a string literal is allowed, then the token is understood to be a string literal instead of an identifier. http://www.sqlite.org/lang_keywords.html
* | | | | | Merge pull request #26634 from kamipo/extract_numeric_dataRafael França2017-05-315-86/+81
|\ \ \ \ \ \ | | | | | | | | | | | | | | Extract `NumericData` model for tests
| * | | | | | Restore the override of numeric attributes properlyRyuta Kamizono2016-12-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `attribute :world_population, :integer` is not a same with default decimal without scale type unless #26302 is merged. Should be `attribute :world_population, :big_integer` for now.
| * | | | | | Extract `NumericDataTest` to `test/cases/numeric_data_test.rb`Ryuta Kamizono2016-12-222-68/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To ease to find the numeric data tests, extract `NumericDataTest` to `test/cases/numeric_data_test.rb` dedicated file.
| * | | | | | Extract `NumericData` model for testsRyuta Kamizono2016-09-274-19/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `NumericData` model is defined some places.
* | | | | | | Merge pull request #29296 from kamipo/delegate_extending_to_relationKasper Timm Hansen2017-05-313-1/+9
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Add missing `delegate :extending, to: :all`
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-06 07:27:13 +0000