aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #29356 from kamipo/testing_reserved_word_test_for_all_adap...Eileen M. Uchitelle2017-06-052-151/+132
|\ \ \ \ \ \ \ \
| * | | | | | | | Testing `ReservedWordTest` for all adaptersRyuta Kamizono2017-06-052-151/+132
* | | | | | | | | Remove deprecated passing of string to :if/:unless (#29357)Joe Francis2017-06-061-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #29347 from prathamesh-sonpatki/rm-assert-nothin-raisedEileen M. Uchitelle2017-06-041-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove assert_nothing_raised, as test is already testing the required concernsPrathamesh Sonpatki2017-06-031-3/+3
* | | | | | | | | Don't mark the schema loaded until it's really finishedMatthew Draper2017-06-051-3/+5
* | | | | | | | | Merge pull request #29294 from gsamokovarov/attributes-defaultKasper Timm Hansen2017-06-0439-150/+134
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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 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.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]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]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 testsKoichi ITO2017-06-031-10/+0
|/ / / / / / / / /
* | | | | | | | | Merge pull request #29340 from lucascaton/masterMatthew Draper2017-06-031-4/+14
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Make Rails welcome page responsiveLucas Caton2017-06-031-4/+14
|/ / / / / / / /
* | | | | | | | Merge pull request #29079 from orhantoy/feature/fix-scaffold_controller-gener...Eileen M. Uchitelle2017-06-021-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | [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]Cesar Carruitero2017-05-161-10/+8
* | | | | | | | | | Merge pull request #29135 from Nerian/document_support_for_composite_primary_...Eileen M. Uchitelle2017-06-021-0/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Document support for composite primary keysNerian2017-05-181-0/+19
* | | | | | | | | | | Merge pull request #29282 from kamipo/prevent_making_bind_param_if_casted_val...Eileen M. Uchitelle2017-06-025-9/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Prevent making bind param if casted value is nilRyuta Kamizono2017-05-315-9/+24
* | | | | | | | | | | | 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 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 poltergeistMario Alberto Chávez2017-06-025-11/+59
* | | | | | | | | | | | | Merge pull request #29303 from Empact/bin-pathnameRafael França2017-06-012-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove the pathname dependency from bin/update and bin/setupBen Woosley2017-05-312-4/+2
* | | | | | | | | | | | | | 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` [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]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 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:}` regexRyuta Kamizono2017-06-011-14/+4
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #29220 from kamipo/consolidate_database_specific_json_typesMatthew Draper2017-06-0111-101/+122
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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 modelRyuta Kamizono2017-05-312-2/+11
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #29304 from kamipo/should_use_quote_for_string_literalMatthew Draper2017-06-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |