aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #30020 from rails/active-storage-importDavid Heinemeier Hansson2017-08-0417-19/+127
|\
| * Make sure the test fails if the code chagesRafael Mendonça França2017-08-041-8/+10
| * 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 eager load ActiveRecord::BaseRafael Mendonça França2017-08-032-10/+6
| * 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
| * Generating the app is where the exception is now raisedDavid Heinemeier Hansson2017-08-031-1/+1
| * Merge branch 'master' into active-storage-importDavid Heinemeier Hansson2017-08-023-3/+3
| |\
| * \ Merge branch 'master' into active-storage-importDavid Heinemeier Hansson2017-08-017-8/+10
| |\ \
| * | | Prevent interpolation of ERB elementsDavid Heinemeier Hansson2017-08-011-6/+6
| * | | Add the storage.yml file by defaultDavid Heinemeier Hansson2017-08-011-0/+1
| * | | We moved to storage.ymlDavid Heinemeier Hansson2017-08-012-35/+1
| * | | Add Azure configuration to Active Storage templateMike Gunderloy2017-08-011-0/+8
| * | | Create the skeleton directories needed and ignore accordinglyDavid Heinemeier Hansson2017-07-312-0/+8
| * | | Load activestorage by defaultDavid Heinemeier Hansson2017-07-312-0/+8
| * | | Use config/storage.yml as part of the skeleton and loadingDavid Heinemeier Hansson2017-07-315-6/+45
| * | | Require activestorage per default with asset pipelineDavid Heinemeier Hansson2017-07-311-0/+1
| * | | Include default storage configurationDavid Heinemeier Hansson2017-07-315-0/+36
* | | | Merge pull request #30058 from y-yagi/use_assert_nil_if_value_is_nil_in_asser...Rafael França2017-08-041-1/+5
|\ \ \ \
| * | | | Use `assert_nil` if `value` is nil in `assert_field_default_value`yuuji.yaginuma2017-08-031-1/+5
| | |_|/ | |/| |
* | | | Merge pull request #30022 from y-yagi/remove_extra_empty_lineEileen M. Uchitelle2017-08-041-1/+5
|\ \ \ \
| * | | | Remove extra empty lineyuuji.yaginuma2017-08-021-1/+5
| | |/ / | |/| |
* | | | Merge pull request #29967 from naw/binstub-error-msgRichard Schneeman2017-08-031-5/+16
|\ \ \ \
| * | | | Revise bundle binstub error messageNathan Wenneker2017-08-031-8/+13
| * | | | Improve bundler binstub error messageNathan Wenneker2017-07-261-3/+9
* | | | | Merge pull request #30011 from guilherme/fix-migration-generator-special-casesSean Griffin2017-08-031-0/+22
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Handling add/remove to/from migration edge casesGuilherme Reis Campos2017-08-031-0/+22
* | | | | Merge remote-tracking branch 'origin/master' into unlock-minitestRafael Mendonça França2017-08-0159-490/+827
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | 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
| | |/ / /
| * | | | 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
| | | |_|/ | | |/| |
| * | | | 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
| | | |_|/ | | |/| |
| * | | | Fix rubocop style issues in yarn and spring.rb templates"roberts10002017-07-312-3/+3
| | |/ / | |/| |
| * | | Set Ruby version in Gemfile and .ruby-version by defaultAlberto Almagro2017-07-315-0/+25
| | |/ | |/|
| * | Fix `warning: method redefined;`yuuji.yaginuma2017-07-281-3/+3
| |/
| * Merge pull request #29926 from pawandubey:fix-test-with-absolute-pathsKasper Timm Hansen2017-07-252-1/+30
| |\
| | * Allow bin/rails test task to take absolute paths as argumentsPawan Dubey2017-07-252-3/+29
| * | Merge pull request #29931 from y-yagi/extract_assert_output_and_available_pty...Sean Griffin2017-07-254-65/+36
| |\ \ | | |/ | |/|
| | * Extract `assert_output` and `available_pty?` into `ConsoleHelpers` moduleyuuji.yaginuma2017-07-254-65/+36
| * | Fix `dbconsole` test when tempdir is a long pathSean Griffin2017-07-251-1/+1
| * | Merge pull request #29916 from lugray/stop_generating_application_recordEileen M. Uchitelle2017-07-256-34/+35
| |\ \ | | |/ | |/|
| | * Stop creating ApplicationRecord on model generationLisa Ugray2017-07-246-34/+35
| * | Fix `warning: ambiguous first argument`yuuji.yaginuma2017-07-251-1/+1