aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #30115 from intrip/30049-application-controller-renderer-d...Rafael França2017-08-081-4/+6
|\
| * Fix ApplicationController.renderer.defaults overriding in developmentJacopo2017-07-201-4/+6
* | Merge pull request #30142 from yukideluxe/add-missing-bit-reload-associations...Sean Griffin2017-08-082-6/+36
|\ \
| * | add missing collection.reload documentation [ci skip]Julia López2017-08-082-6/+36
* | | Merge pull request #30133 from kamipo/fix_random_ci_failureRafael França2017-08-081-1/+1
|\ \ \
| * | | Fix random CI failure due to non-deterministic sorting orderRyuta Kamizono2017-08-081-1/+1
* | | | Merge pull request #30123 from yhirano55/fix_dummy_app_configurationRafael França2017-08-081-3/+5
|\ \ \ \
| * | | | Fix dummy_app configurationYoshiyuki Hirano2017-08-081-3/+5
* | | | | Merge pull request #30122 from yhirano55/use_with_dummy_app_in_gitignoreRafael França2017-08-081-1/+1
|\ \ \ \ \
| * | | | | Use `with_dummy_app?` in gitignoreYoshiyuki Hirano2017-08-081-1/+1
| |/ / / /
* | | | | Merge pull request #30118 from georgeclaghorn/active-storage-load-hooksRafael França2017-08-081-16/+15
|\ \ \ \ \
| * | | | | Set ActiveStorage::Blob.service when ActiveStorage::Blob is loadedGeorge Claghorn2017-08-081-16/+15
* | | | | | Document `ActiveRecord::AttributeMethods::Dirty`Sean Griffin2017-08-081-9/+9
| |_|_|/ / |/| | | |
* | | | | Merge pull request #30125 from yukideluxe/add-reload-to-associations-docsRafael França2017-08-082-4/+14
|\ \ \ \ \
| * | | | | add reload_association to documentation [ci skip]Julia López2017-08-072-4/+14
| | |/ / / | |/| | |
* | | | | Merge pull request #30127 from y-yagi/deprecate_support_of_older_config_ruRafael França2017-08-083-1/+43
|\ \ \ \ \
| * | | | | Deprecate support of older `config.ru`yuuji.yaginuma2017-08-083-1/+43
* | | | | | Merge pull request #30135 from ffmike/azure-storage-fix-content-typeRafael Mendonça França2017-08-082-3/+11
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Support content_type in AzureStorageService#urlMike Gunderloy2017-08-082-2/+12
* | | | | | ActiveStorage:Add migrations per rails engine conventions (#30111)Dino Maric2017-08-084-14/+6
|/ / / / /
* | | | | [ci skip] Postgres --> PostgreSQLRyuta Kamizono2017-08-084-4/+4
* | | | | Merge pull request #30132 from ydakuka/patch-1Ryuta Kamizono2017-08-081-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [ci skip] Update action_mailer_basics.mdYauheni Dakuka2017-08-081-1/+1
|/ / / /
* | / / [ci skip] Prefer cookies.encrypted over signed (#30129)Claudio B2017-08-074-4/+4
| |/ / |/| |
* | | Extend image_tag to accept ActiveStorage Attachments and Variants (#30084)Anton Khamets2017-08-075-6/+66
| |/ |/|
* | Capitalize RakeJon Moss2017-08-061-1/+1
* | Remove extra space between two sentencesJon Moss2017-08-061-1/+1
* | Lint railties/CHANGELOG.mdJon Moss2017-08-061-2/+2
* | Lint activesupport/CHANGELOG.mdJon Moss2017-08-061-7/+7
* | Lint activerecord/CHANGELOG.mdJon Moss2017-08-061-4/+4
* | Lint actionpack/CHANGELOG.mdJon Moss2017-08-061-3/+3
* | Lint actioncable/CHANGELOG.mdJon Moss2017-08-061-3/+3
|/
* Merge pull request #30094 from dixpac/change_azure_name_in_storage_ymlDavid Heinemeier Hansson2017-08-061-3/+3
|\
| * Fix wrong service name in the storage.ymldixpac2017-08-061-3/+3
* | Merge pull request #30099 from bogdanvlviv/set_version_of_active_storage_to_5...David Heinemeier Hansson2017-08-061-1/+1
|\ \
| * | Active Storage to 5.2.0.alpha inside `activestorage/package.json`bogdanvlviv2017-08-061-1/+1
| |/
* | Merge pull request #30097 from mgiagante/masterRyuta Kamizono2017-08-071-1/+1
|\ \ | |/ |/|
| * Replaces the 17 for the actual call to params[:id] that would make the code w...Mariano Giagante2017-08-061-1/+1
|/
* Pass over Active Storage readme [ci skip] (#30086)Vipul A M2017-08-061-2/+2
* Merge pull request #30089 from yboulkaid/masterRyuta Kamizono2017-08-061-4/+0
|\
| * Remove outdated comment [ci skip]Youssef Boulkaid2017-08-061-4/+0
|/
* Merge pull request #30066 from claudiob/ast-moduleDavid Heinemeier Hansson2017-08-0512-665/+690
|\
| * Merge branch 'master' into ast-moduleDavid Heinemeier Hansson2017-08-0515-28/+33
| |\ | |/ |/|
* | Merge pull request #30068 from kamipo/user_start_with_than_regexpDavid Heinemeier Hansson2017-08-051-4/+4
|\ \
| * | Use `content_type.start_with?("...")` than `content_type =~ /^.../`Ryuta Kamizono2017-08-051-4/+4
* | | Merge pull request #30081 from y-yagi/fix_ruby_warningsDavid Heinemeier Hansson2017-08-056-11/+17
|\ \ \
| * | | Fix ruby warningsyuuji.yaginuma2017-08-056-11/+17
* | | | Merge pull request #30080 from georgeclaghorn/active-storage-secret-key-baseDavid Heinemeier Hansson2017-08-052-4/+2
|\ \ \ \
| * | | | Check for `app.secrets.secret_key_base`, not `app.config.secret_key_base`George Claghorn2017-08-052-4/+2
| |/ / /
* | | | Merge pull request #30082 from kamipo/add_missing_blank_lineDavid Heinemeier Hansson2017-08-051-0/+1
|\ \ \ \