aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #28293 from kamipo/remove_useless_migrator_schema_migratio...Eileen M. Uchitelle2017-03-053-12/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove useless `Migrator.schema_migrations_table_name`Ryuta Kamizono2017-03-053-12/+8
| |/ / / / / / / /
* | | | | | | | | Merge pull request #28259 from ChakreshwarSharma/redirect_to_docVipul A M2017-03-051-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ci skip] Use return with redirect_toChakreshwarSharma2017-03-041-0/+3
* | | | | | | | | | Merge pull request #28264 from y-yagi/do_not_take_screenshot_if_driver_does_n...Eileen M. Uchitelle2017-03-052-1/+30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Do not take screenshot if driver does not support screenshotyuuji.yaginuma2017-03-042-1/+30
* | | | | | | | | | | Revert "Add a changelog entry for #28284 [ci skip]"eileencodes2017-03-051-6/+0
* | | | | | | | | | | Revert "Merge pull request #28283 from y-yagi/silence_puma_startup_messages_i...eileencodes2017-03-051-1/+1
* | | | | | | | | | | Merge pull request #28286 from robin850/skip-system-tests-by-defaultEileen M. Uchitelle2017-03-056-10/+73
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Avoid running system tests by defaultRobin Dupret2017-03-056-10/+73
* | | | | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2017-03-042-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix generated query in Retrieving specific data from multiple tables section ...Vipul A M2017-03-041-1/+1
| * | | | | | | | | | | Remove duplicated "does" [ci skip]Ryuta Kamizono2017-02-141-1/+1
* | | | | | | | | | | | Don't hide method that's been documented API since Rails 2.1Andrew White2017-03-041-3/+3
* | | | | | | | | | | | Merge pull request #28288 from tejasbubane/fix-parameter-missing-docRobin Dupret2017-03-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [ci skip] Fix ParameterMissing exception name in docsTejas Bubane2017-03-041-1/+1
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #28287 from kamipo/fix_db_schema_loadAndrew White2017-03-043-5/+25
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix `rake db:schema:load` with subdirectoriesRyuta Kamizono2017-03-053-5/+25
|/ / / / / / / / / / /
* | | | | | | | | | | Fix a wrong pull request reference [ci skip]Robin Dupret2017-03-041-1/+1
* | | | | | | | | | | Add a changelog entry for #28284 [ci skip]Robin Dupret2017-03-041-0/+6
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #25174 from kamipo-fix_db_migrate_statusAndrew White2017-03-044-24/+75
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix `rake db:migrate:status` with subdirectoriesRyuta Kamizono2017-03-044-24/+75
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #28283 from y-yagi/silence_puma_startup_messages_in_system...Andrew White2017-03-041-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Silence puma startup messages in system testyuuji.yaginuma2017-03-041-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | [ci skip] Add CHANGELOG entry for #28282Andrew White2017-03-041-0/+10
* | | | | | | | | | Merge pull request #28282 from kamipo/dont_share_options_with_with_reference_...Andrew White2017-03-042-7/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't share `options` with a reference type columnRyuta Kamizono2017-03-042-7/+10
* | | | | | | | | | | Merge pull request #28284 from y-yagi/fix_system_test_exampleRobin Dupret2017-03-041-7/+9
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fx system test example [ci skip]yuuji.yaginuma2017-03-041-7/+9
| |/ / / / / / / / /
* | | | | | | | | | Escapes and edits to configuring guide [ci skip] (#28280)Vipul A M2017-03-041-5/+5
* | | | | | | | | | A private method can't be called with `self.`Akira Matsuda2017-03-041-2/+2
* | | | | | | | | | Merge pull request #28265 from 0oneo/association_guideRyuta Kamizono2017-03-041-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | passing unique parameter to belongs_to wrongly0oneo2017-03-031-1/+1
* | | | | | | | | | | Merge pull request #28276 from rails/pkwipAaron Patterson2017-03-033-46/+78
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | remove unused parametersAaron Patterson2017-03-031-6/+6
| * | | | | | | | | | `join_keys` no longer needs a class passed to itAaron Patterson2017-03-033-30/+33
| * | | | | | | | | | refactor so there is only one JoinKeys factory methodAaron Patterson2017-03-031-4/+15
| * | | | | | | | | | ask reflection for klass join reflectionAaron Patterson2017-03-032-13/+16
| * | | | | | | | | | Move join scopes on to the reflection objectAaron Patterson2017-03-032-8/+23
* | | | | | | | | | | Merge pull request #28272 from rails/add-iso8601-and-rfc3339-parsingAndrew White2017-03-038-0/+398
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add `rfc3339` aliases to `xmlschema`Andrew White2017-03-035-0/+25
| * | | | | | | | | | | Add `Time.rfc3339` parsing methodAndrew White2017-03-033-0/+62
| * | | | | | | | | | | Add `ActiveSupport::TimeZone.rfc3339` parsing methodAndrew White2017-03-033-0/+173
| * | | | | | | | | | | Add `ActiveSupport::TimeZone.iso8601` parsing methodAndrew White2017-03-033-0/+138
* | | | | | | | | | | | Merge pull request #28271 from dijonkitchen/patch-2Robin Dupret2017-03-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix spellingJonathan Chen2017-03-031-1/+1
|/ / / / / / / / / / /
* / / / / / / / / / / Remove unnecessary system test codeeileencodes2017-03-031-13/+0
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #28267 from rails/rm-node-from-constraintsAaron Patterson2017-03-032-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove `node` parameter to `join_constraints`Aaron Patterson2017-03-032-3/+3
|/ / / / / / / / /
* | | | | | | | | Fix typo in commentAndrew White2017-03-031-1/+1