aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add Azure to readme Bryan Lim2017-08-021-3/+1
* Skip if credentials aren't providedDavid Heinemeier Hansson2017-08-012-2/+2
* Fix dummy app for inclusion in RailsDavid Heinemeier Hansson2017-08-011-2/+1
* Remove circular dependencyDavid Heinemeier Hansson2017-08-011-2/+0
* Merge branch 'master' into active-storage-importDavid Heinemeier Hansson2017-08-0117-35/+71
|\
| * Merge pull request #30015 from larskanis/use-duktake-on-mingwGuillermo Iguaran2017-08-012-0/+4
| |\
| | * Use duktape gem as default JS engine on Windows-MINGW and MS-Visual-C buildsLars Kanis2017-08-012-0/+4
| * | Update working_with_javascript_in_rails.mdGuillermo Iguaran2017-08-011-1/+1
| * | Clarify route encoding testeileencodes2017-08-011-6/+12
| * | Merge pull request #30023 from y-yagi/remove_unnecessary_doc_directory_deletionGuillermo Iguaran2017-08-012-2/+0
| |\ \
| | * | Remove unnecessary `doc` directory deletionyuuji.yaginuma2017-08-012-2/+0
| * | | Update working_with_javascript_in_rails.mdGuillermo Iguaran2017-08-011-1/+1
| * | | Path parameters should default to UTF8eileencodes2017-08-015-14/+44
| * | | Merge pull request #30029 from yhirano55/fix_rails_command_commentsSean Griffin2017-08-011-3/+3
| |\ \ \
| | * | | [ci skip] Fix rails_command commentsYoshiyuki Hirano2017-08-011-3/+3
| * | | | Merge pull request #30021 from roberts1000/fix-rubocop-issuesRafael França2017-08-012-3/+3
| |\ \ \ \
| | * | | | Fix rubocop style issues in yarn and spring.rb templates"roberts10002017-07-312-3/+3
| | | |/ / | | |/| |
| * | | | Merge pull request #30024 from kamipo/remove_redundant_unless_branchSean Griffin2017-07-311-2/+0
| |\ \ \ \
| | * | | | Remove redundant `unless current_adapter?(:OracleAdapter)`Ryuta Kamizono2017-07-281-2/+0
| * | | | | Talk about bytes not charactersRafael Mendonça França2017-07-311-3/+3
| * | | | | Add backticks around method [ci skip]Ryuta Kamizono2017-08-011-1/+1
| | |/ / / | |/| | |
| * | | | Merge pull request #30017 from bslobodin/fix-typo-in-assert-changesRafael França2017-07-311-1/+1
| |\ \ \ \
| | * | | | fix typo in assert_changes error messageBoris Slobodin2017-07-311-1/+1
* | | | | | Prevent interpolation of ERB elementsDavid Heinemeier Hansson2017-08-011-6/+6
* | | | | | Add the storage.yml file by defaultDavid Heinemeier Hansson2017-08-011-0/+1
* | | | | | Follow same format as action_cableDavid Heinemeier Hansson2017-08-011-1/+3
* | | | | | Cut down on installation adviceDavid Heinemeier Hansson2017-08-011-8/+4
* | | | | | Drop README terms no longer relevantDavid Heinemeier Hansson2017-08-011-12/+0
* | | | | | Add requireDavid Heinemeier Hansson2017-08-011-0/+1
* | | | | | We moved to storage.ymlDavid Heinemeier Hansson2017-08-012-35/+1
* | | | | | Rely on top-level filesDavid Heinemeier Hansson2017-08-012-150/+0
* | | | | | Merge pull request #30034 from ffmike/patch-1Guillermo Iguaran2017-08-011-0/+8
|\ \ \ \ \ \
| * | | | | | Add Azure configuration to Active Storage templateMike Gunderloy2017-08-011-0/+8
|/ / / / / /
* | | | | | Merge pull request #30030 from claudiob/only-diskGuillermo Iguaran2017-08-011-1/+3
|\ \ \ \ \ \
| * | | | | | Let ActiveStorage tests pass only for Diskclaudiob2017-08-011-1/+3
* | | | | | | Merge pull request #30032 from claudiob/remove-httpartyGuillermo Iguaran2017-08-015-21/+18
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Don't depend on HTTPartyclaudiob2017-08-015-21/+18
|/ / / / / /
* | | | | | Setup travis to be able to run CI tests against S3David Heinemeier Hansson2017-07-315-33/+33
* | | | | | Move the direct_upload: true convenience option from the activestorage helper...David Heinemeier Hansson2017-07-313-20/+10
* | | | | | Move to new storage.yml locationDavid Heinemeier Hansson2017-07-311-0/+0
* | | | | | Directory and config installation now done by app_generatorDavid Heinemeier Hansson2017-07-311-7/+0
* | | | | | Create the skeleton directories needed and ignore accordinglyDavid Heinemeier Hansson2017-07-312-0/+8
* | | | | | Fix gitignore to be relativeDavid Heinemeier Hansson2017-07-311-1/+1
* | | | | | Follow form from actioncableDavid Heinemeier Hansson2017-07-311-1/+4
* | | | | | Load activestorage by defaultDavid Heinemeier Hansson2017-07-312-0/+8
* | | | | | Use config/storage.yml as part of the skeleton and loadingDavid Heinemeier Hansson2017-07-319-43/+48
* | | | | | Resolve gemspec typoDavid Heinemeier Hansson2017-07-312-1/+86
* | | | | | No longer usedDavid Heinemeier Hansson2017-07-311-23/+0
* | | | | | Require activestorage per default with asset pipelineDavid Heinemeier Hansson2017-07-311-0/+1
* | | | | | Bring activestorage dependencies into the general GemfileDavid Heinemeier Hansson2017-07-313-233/+14