aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Check whether `Rails.application` defined before calling itAndrew White2017-03-072-1/+11
* Merge pull request #28326 from y-yagi/remove_on_option_that_does_not_existVipul A M2017-03-071-2/+2
|\
| * Remove `:on` option that does ot exist [ci skip]yuuji.yaginuma2017-03-071-2/+2
* | CI against jruby-9.1.8.0Akira Matsuda2017-03-071-3/+3
* | Merge pull request #28320 from y-yagi/fix_typo_titleizeJon Moss2017-03-061-2/+2
|\ \ | |/ |/|
| * Fix typo `titlelize` -> `titleize` [ci skip]yuuji.yaginuma2017-03-071-2/+2
|/
* [ci skip] 🎬 expensive: take twoKasper Timm Hansen2017-03-061-1/+1
* Update `titlelize` regex to allow apostrophesAndrew White2017-03-063-1/+18
* Merge pull request #28257 from yahonda/app_generators_use_oracle_enhancedAndrew White2017-03-062-5/+6
|\
| * Update `database.yml` when `rails new <new_app> -d oracle` specifiedYasuo Honda2017-03-022-5/+6
* | Add CHANGELOG entry for #28250Andrew White2017-03-061-0/+10
* | Merge pull request #28250 from tzabaman/fix_malformed_asset_url_in_ac_rendererAndrew White2017-03-062-0/+15
|\ \
| * | Fix malformed asset_url when rendering template with ActionController::RendererGiorgos Vrettos2017-03-062-0/+15
* | | Merge pull request #28305 from kamipo/extract_schema_migration_all_versionsAndrew White2017-03-063-4/+8
|\ \ \ | |/ / |/| |
| * | Extract `SchemaMigration.all_versions`Ryuta Kamizono2017-03-063-4/+8
* | | Merge pull request #28295 from kamipo/fix_deserialize_with_json_arrayAndrew White2017-03-063-1/+17
|\ \ \
| * | | Fix `deserialize` with JSON arrayRyuta Kamizono2017-03-063-1/+17
| |/ /
* | | Merge pull request #28301 from y-yagi/fix_direct_with_params_exampleJon Moss2017-03-051-1/+1
|\ \ \ | |/ / |/| |
| * | Fix `direct` with params example [ci skip]yuuji.yaginuma2017-03-061-1/+1
* | | Merge pull request #28296 from kamipo/fix_ci_failureJon Moss2017-03-051-2/+2
|\ \ \
| * | | Fix CI failure due to contain <U+2028>Ryuta Kamizono2017-03-061-2/+2
|/ / /
* | | 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
| |/ / / /