aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #30322 from zokioki/fix_action_dispatch_typoRyuta Kamizono2017-08-191-1/+1
|\
| * fix typo in ambiguous route definition error messageZoran Pesic2017-08-181-1/+1
|/
* Merge pull request #30319 from y-yagi/remove_unused_requireRyuta Kamizono2017-08-191-1/+0
|\
| * Remove unused requireyuuji.yaginuma2017-08-191-1/+0
* | Merge pull request #30317 from yhirano55/use_ssl_in_guide_and_commentArun Agrawal2017-08-1911-18/+18
|\ \ | |/ |/|
| * Use ssl in guide and comment [ci skip]Yoshiyuki Hirano2017-08-1911-18/+18
|/
* Merge pull request #30308 from DNNX/rm-pointless-flatten-and-compact-from-am-...Rafael França2017-08-181-7/+5
|\
| * Simplify ActiveModel::Errors#generate_messageViktar Basharymau2017-08-181-7/+5
* | Merge pull request #30314 from yhirano55/use_https_instead_of_http_in_guideGeorge Claghorn2017-08-181-8/+8
|\ \
| * | Use https instead of http or git in guide [ci skip]Yoshiyuki Hirano2017-08-191-8/+8
|/ /
* | Cleanup development_dependencies_install.mdJon Moss2017-08-181-14/+15
* | Add Yarn installation instructions for Active StorageJon Moss2017-08-181-0/+40
* | Merge pull request #30311 from maclover7/jm-rm-ccMatthew Draper2017-08-191-7/+0
|\ \
| * | Remove Active Storage code climate config fileJon Moss2017-08-181-7/+0
|/ /
* | Improve `migration/column_attributes_test.rb` (#25286)Ryuta Kamizono2017-08-181-3/+17
* | Add deterministic sorting order for `test_taking_with_a_number`Ryuta Kamizono2017-08-181-1/+9
* | Restore the ability that SQL with binds for `insert`, `update`, and `delete` ...Ryuta Kamizono2017-08-182-6/+38
* | Add test cases that class level `destroy`, `delete`, and `update` are affecte...Ryuta Kamizono2017-08-181-3/+33
* | Restore `to_sql` to return only SQL (#29945)Ryuta Kamizono2017-08-186-13/+15
* | Add test cases for `where.not` with polymorphic associationRyuta Kamizono2017-08-181-0/+19
* | Merge pull request #30274 from bogdanvlviv/dry-in-generators-testsRafael França2017-08-175-200/+118
|\ \
| * | Move common tests from `AppGeneratorTest` and `PluginGeneratorTest` to `Share...bogdanvlviv2017-08-175-200/+118
* | | Merge pull request #30275 from msimonborg/deep_merge_patchRafael França2017-08-171-12/+6
|\ \ \
| * | | faster implementation of Hash#deep_mergeM. Simon Borg2017-08-161-12/+6
* | | | Add note about JSON/JSONB serialization changesJon Moss2017-08-171-0/+9
* | | | Merge pull request #30199 from robin850/upgrade-sdocRafael França2017-08-172-4/+10
|\ \ \ \
| * | | | Temporarily point to a fork of SDocRobin Dupret2017-08-172-4/+10
| | |/ / | |/| |
* | | | Merge pull request #30294 from yahonda/move_test_index_is_created_for_both_ti...Ryuta Kamizono2017-08-181-11/+11
|\ \ \ \
| * | | | Move `test_index_is_created_for_both_timestamps` to `TimestampsWithoutTransac...Yasuo Honda2017-08-171-11/+11
* | | | | Merge pull request #30292 from maclover7/jm-ast-purgeGeorge Claghorn2017-08-171-0/+7
|\ \ \ \ \
| * | | | | Add missing test for Blob#purgeJon Moss2017-08-171-0/+7
* | | | | | Merge pull request #30293 from maclover7/jm-ast-logsGeorge Claghorn2017-08-171-1/+1
|\ \ \ \ \ \
| * | | | | | Use nil Logger for testsJon Moss2017-08-171-1/+1
* | | | | | | Merge pull request #30295 from ohbarye/follow_up_to_28058Jon Moss2017-08-171-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Remove obsolete explanationohbarye2017-08-171-1/+1
| | |_|/ / / | |/| | | |
* / | | | | Capitalize RedisJon Moss2017-08-171-1/+1
|/ / / / /
* | / / / Encrypt the IRC notification setting, so it's not used on forksMatthew Draper2017-08-171-1/+2
| |/ / / |/| | |
* | | | Merge pull request #30287 from y-yagi/use_queue_adapter_name_to_get_adapter_nameKasper Timm Hansen2017-08-171-3/+1
|\ \ \ \
| * | | | Use `ActiveJob::Base.queue_adapter_name` to get adapter nameyuuji.yaginuma2017-08-171-3/+1
* | | | | Merge pull request #30288 from y-yagi/bump_thor_and_bladeRafael França2017-08-161-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Bump `thor` and `blade`yuuji.yaginuma2017-08-171-3/+3
|/ / / /
* | | | Merge pull request #30048 from yahonda/regexp_aware_schema_dumper_prefix_suffixRafael França2017-08-162-1/+28
|\ \ \ \
| * | | | Allow `table_name_prefix` and `table_name_suffix` have `$`Yasuo Honda2017-08-042-1/+28
* | | | | Merge pull request #30285 from albertoalmagro/pass-missing-name-attributeRafael França2017-08-162-7/+12
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Pass missing name attribute to execute_hookAlberto Almagro2017-08-162-7/+12
| | |_|/ | |/| |
* | | | Merge pull request #30260 from kamipo/remove_unused_action_argRafael França2017-08-161-2/+3
|\ \ \ \
| * | | | Remove unused `action` arg for `generate_routing_code`Ryuta Kamizono2017-08-151-2/+3
* | | | | Test with released thorRafael Mendonça França2017-08-162-36/+28
| |/ / / |/| | |
* | | | Add spaceJon Moss2017-08-161-1/+1
* | | | Small grammar fixesJon Moss2017-08-161-1/+1