aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge pull request #29145 from kamipo/reference_type_should_be_not_nullMatthew Draper2017-05-242-1/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Both reference id and type should be `NOT NULL` if `null: false` is specifiedRyuta Kamizono2017-05-192-1/+9
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #28644 from mtsmfm/set-capybara-app-hostMatthew Draper2017-05-242-1/+18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Set `Capybara.app_host` through `host!`Fumiaki MATSUSHIMA2017-04-022-1/+18
* | | | | | | | | | | | Merge pull request #29027 from mohitnatoo/foreign-key-nameMatthew Draper2017-05-241-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [Foreign Key] Don't worry about the building identifier if name is already pr...Mohit Natoo2017-05-101-2/+3
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #29167 from koic/remove_duplicate_inverse_associations_testMatthew Draper2017-05-241-14/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove a duplicate test of inverse_associations_test in ARKoichi ITO2017-05-211-14/+0
* | | | | | | | | | | | Merge pull request #29174 from kamipo/remove_unused_join_part_nameMatthew Draper2017-05-241-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove unused `JoinPart#name`Ryuta Kamizono2017-05-221-4/+0
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #29179 from y-yagi/remove_rubygems_version_lockMatthew Draper2017-05-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove rubygems version lockyuuji.yaginuma2017-05-221-1/+1
* | | | | | | | | | | | | Merge pull request #29182 from kamipo/remove_unused_left_joins_values_generationMatthew Draper2017-05-242-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove unused `left_joins_values` generationRyuta Kamizono2017-05-232-2/+2
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #29183 from kamipo/refactor_making_join_constraintsMatthew Draper2017-05-241-23/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Refactor making join constraintsRyuta Kamizono2017-05-231-23/+6
* | | | | | | | | | | | | | Merge pull request #29184 from kirs/nested-attributes-friendly-errorMatthew Draper2017-05-242-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | More friendly exception in nested attributesKir Shatrov2017-05-222-2/+2
| |/ / / / / / / / / / / /
* / / / / / / / / / / / / Remove unused simulate methodeileencodes2017-05-222-21/+21
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #29178 from simi/patch-1प्रथमेश Sonpatki2017-05-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Update test link in ActionView javascripts README.md.Josef Šimánek2017-05-221-1/+1
|/ / / / / / / / / / /
* / / / / / / / / / / We always + 1 to __LINE__ when class_evaling with <<Akira Matsuda2017-05-221-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #29173 from ffmike/simplify-getting-startedRobin Dupret2017-05-211-12/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Simplify handling of prerequisites in Getting Started guide [ci skip]Mike Gunderloy2017-05-211-12/+13
* | | | | | | | | | | Merge pull request #29072 from dixpac/dixpac/add_documentation_for_validate_a...Robin Dupret2017-05-215-1/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Improving docs for callbacks execution order [ci skip]dixpac2017-05-215-1/+32
* | | | | | | | | | | | Merge pull request #29163 from rails/fix-scalar-duration-calculationAndrew White2017-05-213-6/+91
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix implicit calculations with scalars and durationsAndrew White2017-05-203-6/+91
* | | | | | | | | | | | | Merge pull request #29170 from ffmike/remove-obsolete-guidesKasper Timm Hansen2017-05-212-246/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Remove obsolete Guides source files [ci skip]Mike Gunderloy2017-05-212-246/+0
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #29168 from ffmike/fix-broken-links-guidesप्रथमेश Sonpatki2017-05-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix broken external link in security guide.Mike Gunderloy2017-05-211-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | bundle up sidekiq to the one with safer integration with Rails 5Akira Matsuda2017-05-211-3/+3
* | | | | | | | | | | Merge pull request #29166 from kevinhyunilkim/fix_typo_in_guideRyuta Kamizono2017-05-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix typo in guidesKevin Kim2017-05-211-1/+1
|/ / / / / / / / / /
* | | | | | | | | | identifiers is already defined via Connection::Identification moduleAkira Matsuda2017-05-211-1/+1
* | | | | | | | | | bundle up redis to the one that does not warn about ::Fixnum deprecationAkira Matsuda2017-05-211-2/+2
* | | | | | | | | | Merge pull request #29156 from kamipo/make_valid_directions_to_setAndrew White2017-05-201-3/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make `VALID_DIRECTIONS` to `Set`Ryuta Kamizono2017-05-201-3/+5
* | | | | | | | | | | Merge pull request #29162 from ffmike/update-rack-guideVijay Dev2017-05-201-6/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update 'Rails on Rack' guide [ci skip]Mike Gunderloy2017-05-201-6/+11
|/ / / / / / / / / / /
* | / / / / / / / / / Remove unused mismatch payload attributeDavid Heinemeier Hansson2017-05-201-5/+1
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #29158 from ffmike/add-json-feedAndrew White2017-05-205-7/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add :json type to auto_discovery_link_tagMike Gunderloy2017-05-205-7/+14
* | | | | | | | | | | Unused variableDavid Heinemeier Hansson2017-05-201-1/+0
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #29153 from kamipo/fix_warning_assigned_but_unused_variableKasper Timm Hansen2017-05-201-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix `warning: assigned but unused variable - timestamp`Ryuta Kamizono2017-05-201-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #29134 from joshaidan/document-action-nameAlex Kitchens2017-05-191-0/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Clarified description of formats [ci skip]Brian Jones2017-05-191-1/+1
| * | | | | | | | | Added missing punctuation [ci skip]Brian Jones2017-05-181-3/+3