aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Should use `quote` for a string literalRyuta Kamizono2017-06-011-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #26634 from kamipo/extract_numeric_dataRafael França2017-05-315-86/+81
|\ \ \ \ \ \ \ \
| * | | | | | | | Restore the override of numeric attributes properlyRyuta Kamizono2016-12-221-0/+5
| * | | | | | | | Extract `NumericDataTest` to `test/cases/numeric_data_test.rb`Ryuta Kamizono2016-12-222-68/+71
| * | | | | | | | Extract `NumericData` model for testsRyuta Kamizono2016-09-274-19/+6
* | | | | | | | | Merge pull request #29296 from kamipo/delegate_extending_to_relationKasper Timm Hansen2017-05-313-1/+9
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Add missing `delegate :extending, to: :all`Ryuta Kamizono2017-06-013-1/+9
|/ / / / / / / /
* | | | | | | | Merge pull request #29290 from koic/remove_redundant_habtm_associations_testMatthew Draper2017-05-311-13/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove a redundant test case of HABTM_associations_testKoichi ITO2017-05-311-13/+0
* | | | | | | | | Merge pull request #29292 from vfonic/patch-1Ryuta Kamizono2017-05-311-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Docs: Fix output representation [ci skip]Viktor Fonic2017-05-311-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #29088 from greysteil/better-spacing-in-production-environ...Matthew Draper2017-05-311-3/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Better spacing in environments/production.rb fileGrey Baker2017-05-151-3/+4
* | | | | | | | | | Merge pull request #29261 from kamipo/dont_expose_methods_and_attrs_for_inter...Matthew Draper2017-05-317-29/+39
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Don't expose methods and attrs for internal usageRyuta Kamizono2017-05-307-29/+39
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #28864 from yahonda/pg10_pg_sequencesMatthew Draper2017-05-311-1/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Support PostgreSQL 10 `pg_sequence`Yasuo Honda2017-05-301-1/+9
|/ / / / / / / /
* | | | | | | | Merge pull request #29187 from robin850/remove-mathnRafael França2017-05-303-9/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove requirement on mathnRobin Dupret2017-05-303-9/+11
* | | | | | | | | Merge pull request #29285 from SamSaffron/remove_therubyracerGuillermo Iguaran2017-05-304-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace therubyracer with mini_racerSam2017-05-304-4/+4
|/ / / / / / / / /
* | / / / / / / / Add next occur and previous occurred day of week API (#26600)Shota Iguchi2017-05-303-0/+42
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Add an extra test showing why collections are cachedMatthew Draper2017-05-301-0/+7
* | | | | | | | Merge pull request #29098 from kamipo/fix_association_with_extension_issuesMatthew Draper2017-05-3012-34/+64
|\ \ \ \ \ \ \ \
| * | | | | | | | Extract `default_extensions` to avoid `klass.all`Ryuta Kamizono2017-05-302-1/+9
| * | | | | | | | Refactor `default_scoped` to avoid creating extra relation and mergingRyuta Kamizono2017-05-281-7/+2
| * | | | | | | | Cache the association proxy objectRyuta Kamizono2017-05-283-4/+13