aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #28354 from kamipo/fix_select_with_block_and_dirty_targetEileen M. Uchitelle2017-03-093-2/+14
|\ \ \ \ \ \ \
| * | | | | | | Fix select with block doesn't return newly built records in has_many associationRyuta Kamizono2017-03-093-2/+14
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'refactor-system-test-driver'eileencodes2017-03-099-91/+64
|\ \ \ \ \ \ \
| * | | | | | | Call system test driver per-instance rather than globallyeileencodes2017-03-097-42/+36
| * | | | | | | Refactor system test driver/browsereileencodes2017-03-096-56/+35
|/ / / / / / /
* / / / / / / force UTF-8 as external encoding in guides generation [ci skip]Xavier Noria2017-03-091-3/+16
|/ / / / / /
* | | | | | Merge pull request #28340 from k3rni/document-am-default-url-optionsJon Moss2017-03-081-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Document using `default_url_options` in an ActionMailer class.Krzysztof Zych2017-03-081-0/+3
* | | | | | Merge pull request #28336 from tjschuck/test_delegated_params_methodsRafael França2017-03-081-0/+63
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Tests for delegated public methods on AC::ParametersT.J. Schuck2017-03-071-0/+63
* | | | | | Merge pull request #28338 from y-yagi/use_appropriate_type_in_generators_testKasper Timm Hansen2017-03-081-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use appropriate type in generators testyuuji.yaginuma2017-03-081-1/+1
* | | | | | params --> parametersJon Moss2017-03-071-2/+2
* | | | | | Merge pull request #28334 from tjschuck/document_delegated_params_methodsJon Moss2017-03-071-0/+71
|\ \ \ \ \ \
| * | | | | | Document delegated public methods on AC::ParametersT.J. Schuck2017-03-071-0/+71
|/ / / / / /
* | | | | | Merge pull request #28289 from maicher/masterVipul A M2017-03-071-2/+18
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Improve foreign key description in guides [ci skip]Krzysztof Maicher2017-03-061-2/+18
* | | | | | 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