aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Do not call isolate_namespace on the applicationRafael Mendonça França2017-08-041-1/+9
* Include active_storage in all generated application.rb filesDavid Heinemeier Hansson2017-08-043-1/+4
* Convert to strings so array can be sorted deterministicallyDavid Heinemeier Hansson2017-08-041-3/+3
* Deterministic comparisons pleaseDavid Heinemeier Hansson2017-08-031-3/+3
* Do not change the entire codebase style only because of active_storageRafael Mendonça França2017-08-032-5/+2
* Merge pull request #30041 from dixpac/change_azure_core_dependecyRafael França2017-08-032-13/+4
|\
| * Depend on offical azure-coredixpac2017-08-032-13/+4
* | Fix all rubocop violationsRafael Mendonça França2017-08-032-6/+5
* | Merge pull request #30061 from claudiob/ast-rubocopRafael França2017-08-035-5/+5
|\ \
| * | Make Rubocop happier about ActiveStorageclaudiob2017-08-035-5/+5
* | | We need to require the top file before individual oneRafael Mendonça França2017-08-031-0/+1
* | | Do not eager load ActiveRecord::BaseRafael Mendonça França2017-08-036-22/+6
* | | Merge branch 'active-storage-import' of github.com:rails/rails into active-st...David Heinemeier Hansson2017-08-035-7/+85
|\ \ \
| * | | Remove duplicated convert_direct_upload_option_to_urlRafael Mendonça França2017-08-032-7/+4
| * | | Refactor convert_direct_upload_option_to_urlRafael Mendonça França2017-08-032-3/+35
| * | | Make sure Action View doesn't break with Active StorageRafael Mendonça França2017-08-033-1/+50
* | | | Active Storage routes are now part of the default routesDavid Heinemeier Hansson2017-08-031-9/+37
|/ / /
* | | Same issue from AR getting loaded earlierDavid Heinemeier Hansson2017-08-031-3/+3
* | | Including new default classes in loading testDavid Heinemeier Hansson2017-08-031-3/+3
* | | Active Storage loads AR earlier to extend it so require env laterDavid Heinemeier Hansson2017-08-031-3/+7
* | | There is no reason to single line methods hereRafael Mendonça França2017-08-031-4/+12
|/ /
* | Generating the app is where the exception is now raisedDavid Heinemeier Hansson2017-08-031-1/+1
* | Can't initialize a message verifier without a key baseDavid Heinemeier Hansson2017-08-031-1/+3
* | Merge pull request #30053 from ffmike/patch-2Richard Schneeman2017-08-031-1/+2
|\ \ | |/ |/|
| * Tweak requiresMike Gunderloy2017-08-021-1/+1
| * Use release azure-core gemMike Gunderloy2017-08-021-1/+1
| * Update README.mdMike Gunderloy2017-08-021-1/+1
| * Add Azure gems to READMEMike Gunderloy2017-08-021-1/+2
|/
* Merge pull request #30046 from kamipo/fix_string_literals_violations_for_acti...Rafael França2017-08-0217-28/+27
|\
| * Fix `Style/StringLiterals` violations for Active StorageRyuta Kamizono2017-08-0317-28/+27
|/
* Merge branch 'master' into active-storage-importDavid Heinemeier Hansson2017-08-0238-110/+211
|\
| * Merge pull request #29958 from znz/file-nullMatthew Draper2017-08-025-5/+5
| |\
| | * Use File::NULL instead of "/dev/null"Kazuhiro NISHIYAMA2017-07-315-5/+5
| * | Merge pull request #29914 from kamipo/relation_merger_should_not_fill_empty_v...Matthew Draper2017-08-023-19/+30
| |\ \
| | * | `get_value` and `set_value` in `Relation` are no longer used externallyRyuta Kamizono2017-07-251-9/+10
| | * | `Relation::Merger` should not fill `values` with empty valuesRyuta Kamizono2017-07-252-10/+20
| * | | Merge pull request #29842 from kamipo/fix_find_by_with_rangeMatthew Draper2017-08-023-4/+12
| |\ \ \
| | * | | Fix `find_by` with range conditionsRyuta Kamizono2017-07-203-4/+12
| * | | | Merge pull request #29271 from rails/unlock-minitestKasper Timm Hansen2017-08-0222-75/+105
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/master' into unlock-minitestRafael Mendonça França2017-08-012023-2034/+16833
| | |\ \ \ \
| | * \ \ \ \ Merge pull request #29995 from y-yagi/fix_test_runner_outputKasper Timm Hansen2017-07-302-2/+2
| | |\ \ \ \ \
| | | * | | | | Fix test runner's outputyuuji.yaginuma2017-07-302-2/+2
| | |/ / / / /
| | * | | | | Merge pull request #29823 from y-yagi/fix_record_not_unique_errorKasper Timm Hansen2017-07-171-20/+20
| | |\ \ \ \ \
| | | * | | | | Move `reset_pk_sequence!` test to `AdapterTestWithoutTransaction`yuuji.yaginuma2017-07-171-20/+20
| | |/ / / / /
| | * | | | | Merge pull request #29808 from y-yagi/reset_colun_information_after_schema_ch...Kasper Timm Hansen2017-07-161-0/+2
| | |\ \ \ \ \
| | | * | | | | Reset column information after schema changedyuuji.yaginuma2017-07-161-0/+2
| | |/ / / / /
| | * | | | | Merge pull request #29380 from y-yagi/insert_environment_value_to_table_befor...Kasper Timm Hansen2017-07-151-0/+4
| | |\ \ \ \ \
| | | * | | | | Insert environment value to `InternalMetadata` after recreating the tableyuuji.yaginuma2017-06-091-0/+4
| | * | | | | | Stupid empty line added after merge.Kasper Timm Hansen2017-07-151-1/+0
| | * | | | | | Bump minitest; Use double quotesKasper Timm Hansen2017-07-152-2/+2