Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | `counter_cache` requires association class before `attr_readonly` | Yasuo Honda | 2017-08-23 | 1 | -0/+3 |
| | | | | | There were similar pull requests #26370 #27575 fixed by different way by moving `require "models/post"` before `require "models/comment"` | ||||
* | Merge pull request #30363 from ibrahimab/patch-1 | Ryuta Kamizono | 2017-08-23 | 1 | -1/+1 |
|\ | | | | | Fixing nginx configuration added missing semicolon [ci skip] | ||||
| * | Fixing nginx configuration added missing semicolon | Ibrahim | 2017-08-22 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #30336 from bogdanvlviv/use_version_5_2_for_activestorage | Rafael França | 2017-08-22 | 2 | -2/+2 |
|\ | | | | | Use 5.2 version of ActiveRecord::Migration for Active Storage | ||||
| * | Use 5.2 version of ActiveRecord::Migration for Active Storage | bogdanvlviv | 2017-08-22 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #30356 from ↵ | Kasper Timm Hansen | 2017-08-22 | 2 | -2/+1 |
|\ | | | | | | | | | bogdanvlviv/remove-frozen_string_literal-from-blob-migration Remove frozen_string_literal comment from activestorage's migration | ||||
| * | Remove frozen_string_literal comment from activestorage's migration | bogdanvlviv | 2017-08-22 | 2 | -2/+1 |
| | | | | | | | | | | The activestorage's migration is used as template for apps Related to #30348 | ||||
* | | Merge pull request #23425 from yui-knk/support_sti_automatically_inverse | Akira Matsuda | 2017-08-22 | 3 | -2/+43 |
|\ \ | | | | | | | Automatically guess the inverse associations for STI | ||||
| * | | Automatically guess the inverse associations for STI | yui-knk | 2017-08-22 | 3 | -2/+43 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord associations automatically guess the inverse associations. But this feature does not work correctly on assoctions for STI. For example, before this commit ``` class Post < ActiveRecord::Base belongs_to :author end class SpecialPost < Post; end class Author < ActiveRecord::Base has_many :posts has_many :special_posts end ``` `author.posts.first.author` works correctly, but `author.special_posts.first.author` does not work correctly. | ||||
* | | Merge pull request #30357 from ydakuka/missing-backquotes | Ryuta Kamizono | 2017-08-22 | 3 | -4/+4 |
|\ \ | | | | | | | missing backquotes [ci skip] | ||||
| * | | missing backquotes [ci skip] | Yauheni Dakuka | 2017-08-22 | 3 | -4/+4 |
| | | | |||||
* | | | Merge pull request #30353 from yhirano55/use_https_instead_of_http_in_actionpack | Ryuta Kamizono | 2017-08-22 | 9 | -21/+21 |
|\ \ \ | | | | | | | | | [actionpack] Update links to use https link instead of http [ci skip] | ||||
| * | | | Update links to use https link instead of http [ci skip] | Yoshiyuki Hirano | 2017-08-22 | 9 | -21/+21 |
|/ / / | |||||
* | | | Merge pull request #30354 from ↵ | Ryuta Kamizono | 2017-08-22 | 12 | -13/+13 |
|\ \ \ | | | | | | | | | | | | | | | | | yhirano55/use_https_instead_of_http_in_activerecord [activerecord] Update links to use https instead of http [ci skip] | ||||
| * | | | Update links to use https instead of http [ci skip] | Yoshiyuki Hirano | 2017-08-22 | 12 | -13/+13 |
| | |/ | |/| | |||||
* | | | Merge pull request #30348 from koic/remove_frozen_string_literal_from_templates | George Claghorn | 2017-08-21 | 42 | -85/+0 |
|\ \ \ | | | | | | | | | Remove frozen_string_literal magic comment from templates | ||||
| * | | | Remove frozen_string_literal magic comment from templates | Koichi ITO | 2017-08-22 | 42 | -85/+0 |
| | | | | |||||
* | | | | Merge pull request #30355 from ↵ | Ryuta Kamizono | 2017-08-22 | 5 | -6/+6 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | yhirano55/use_https_instead_of_http_in_activesupport [activesupport] Update links to use https instead of http [ci skip] | ||||
| * | | | | Update links to use https instead of http [ci skip] | Yoshiyuki Hirano | 2017-08-22 | 5 | -6/+6 |
|/ / / / | |||||
* | | | | Merge pull request #30352 from yhirano55/update_licenses_link | Ryuta Kamizono | 2017-08-22 | 12 | -15/+14 |
|\ \ \ \ | | | | | | | | | | | Update MIT licenses link [ci skip] | ||||
| * | | | | Update MIT licenses link [ci skip] | Yoshiyuki Hirano | 2017-08-22 | 12 | -15/+14 |
| | |/ / | |/| | | |||||
* | | | | Add frozen string literal pragma | George Claghorn | 2017-08-21 | 1 | -0/+2 |
| | | | | |||||
* | | | | Encode Content-Disposition filenames according to RFC 2231 | George Claghorn | 2017-08-21 | 6 | -4/+74 |
| |_|/ |/| | | | | | | | | Closes #30134. | ||||
* | | | Merge pull request #30349 from ydakuka/patch-1 | Ryuta Kamizono | 2017-08-22 | 1 | -4/+4 |
|\ \ \ | | | | | | | | | Update debugging rails applications guide [ci skip] | ||||
| * | | | Update debugging_rails_applications [ci skip] | Yauheni Dakuka | 2017-08-21 | 1 | -4/+4 |
|/ / / | |||||
* | | | Merge pull request #28912 from kaspth/getting-started-form-with | Kasper Timm Hansen | 2017-08-21 | 2 | -67/+100 |
|\ \ \ | |_|/ |/| | | [ci skip] form_with in the getting started guide. | ||||
| * | | [ci skip] form_with in the getting started guide. | Kasper Timm Hansen | 2017-08-21 | 2 | -67/+100 |
| | | | | | | | | | | | | Add back a bit about a resource oriented style of routing. | ||||
* | | | Merge pull request #30346 from ↵ | Ryuta Kamizono | 2017-08-22 | 2 | -2/+2 |
|\ \ \ | |_|/ |/| | | | | | | | | yhirano55/fix_broken_link_to_mysql_docs_in_database_yml Fix broken link to mysql docs in database.yml [ci skip] | ||||
| * | | Fix broken link to mysql docs in database.yml [ci skip] | Yoshiyuki Hirano | 2017-08-22 | 2 | -2/+2 |
|/ / | |||||
* | | Merge pull request #30345 from yhirano55/fix_link_contributing_guide | Eileen M. Uchitelle | 2017-08-21 | 1 | -7/+7 |
|\ \ | | | | | | | Fix link in Contributing Ruby on Rails guide [ci skip] | ||||
| * | | Fix link Contributing Ruby on Rails [ci skip] | Yoshiyuki Hirano | 2017-08-21 | 1 | -7/+7 |
|/ / | | | | | | | | | | | | | | | | | * Add Contributing to the Rails Code link. * Wiki link for Spanish is redirect. * The base branch of Polish repo is master. And Turkish is, too. * Unified expression `rails-dev-box` * The Clone url is wrong. * The mailing list url is old. | ||||
* | | Merge pull request #30344 from yhirano55/update_guide_contributing_ruby_on_rails | प्रथमेश Sonpatki | 2017-08-21 | 1 | -1/+1 |
|\ \ | | | | | | | Update Contributing to Ruby on Rails guide [ci skip] | ||||
| * | | Update Contributing to Ruby on Rails guide [ci skip] | Yoshiyuki Hirano | 2017-08-21 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #30343 from yhirano55/update_generator_guide | Vipul A M | 2017-08-21 | 1 | -4/+8 |
|\ \ | | | | | | | Update generator guide [ci skip] | ||||
| * | | Update generator guide [ci skip] | Yoshiyuki Hirano | 2017-08-21 | 1 | -4/+8 |
| | | | |||||
* | | | Prevent extra `SET time zone` in `configure_connection` (#28413) | Ryuta Kamizono | 2017-08-21 | 2 | -6/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | `SET time zone 'value'` is an alias for `SET timezone TO 'value'`. https://www.postgresql.org/docs/current/static/sql-set.html So if `variables["timezone"]` is specified, it is enough to `SET timezone` once. | ||||
* | | | Merge pull request #30341 from yhirano55/update_rails_on_rack_guide | प्रथमेश Sonpatki | 2017-08-21 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Update Rails on Rack guide [ci skip] | ||||
| * | | Update Rails on Rack guide [ci skip] | Yoshiyuki Hirano | 2017-08-21 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #30332 from y-yagi/fix_29306 | George Claghorn | 2017-08-20 | 7 | -17/+44 |
|\ \ | | | | | | | Make `restart` and `dev:cache` tasks work when customizing pid file path | ||||
| * | | Make `restart` and `dev:cache` tasks work when customizing pid file path | yuuji.yaginuma | 2017-08-21 | 7 | -17/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally, it hard-coded pid file path. It can not be removed when customizing pid file path. But rake task can not get pid file path. Therefore, do not remove file in rake task, makes it possible to judge whether it is restart from the argument of the command and removes the file in server command. Fixes #29306 | ||||
* | | | Merge pull request #30340 from ↵ | Ryuta Kamizono | 2017-08-21 | 1 | -1/+10 |
|\ \ \ | | | | | | | | | | | | | | | | | yhirano55/update_autoloading_and_reloading_constants Update Autoloading and Reloading Constants guide [ci skip] | ||||
| * | | | Update result of autoload_paths in Autoloading and Reloading Constants guide ↵ | Yoshiyuki Hirano | 2017-08-21 | 1 | -1/+10 |
|/ / / | | | | | | | | | | [ci skip] | ||||
* | | | Update regex | George Claghorn | 2017-08-20 | 1 | -1/+1 |
| | | | |||||
* | | | Fix tests | George Claghorn | 2017-08-20 | 4 | -4/+4 |
| | | | |||||
* | | | Fix syntax error | George Claghorn | 2017-08-20 | 1 | -1/+1 |
| | | | |||||
* | | | DRY | George Claghorn | 2017-08-20 | 8 | -16/+20 |
| | | | |||||
* | | | Rename ActiveStorage::Filename#extname to extension_with_delimiter | George Claghorn | 2017-08-20 | 2 | -9/+29 |
| | | | |||||
* | | | Merge pull request #30339 from bogdanvlviv/add-activestorage_bin_test-file | George Claghorn | 2017-08-20 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | Add executable file `activestorage/bin/test` | ||||
| * | | | Add executable file `activestorage/bin/test` | bogdanvlviv | 2017-08-20 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` rails$ cd activestorage/ rails/activestorage$ bin/test ........(compressed).... rails/activestorage$ bin/test test/controllers/disk_controller_test.rb .(compressed).. rails/activestorage$ bin/test test/controllers/disk_controller_test.rb:42 . ``` | ||||
* | | | | Merge pull request #30121 from assain/add_expires_in_and_expires_at_to_cookies | Kasper Timm Hansen | 2017-08-20 | 3 | -5/+54 |
|\ \ \ \ | | | | | | | | | | | Add expiry metadata to Cookies and freshen expires option to support duration |