Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | We are using railtie, not engine | David Heinemeier Hansson | 2015-12-16 | 1 | -1/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into merge-action-cable | Rafael Mendonça França | 2015-12-15 | 1 | -2/+2 | |
|\| | ||||||
| * | Update seeds.rb.tt | Paul Clegg | 2015-12-14 | 1 | -2/+2 | |
| | | | | | | | | Rahm Emanuel doesn't deserve to be in Rails. | |||||
* | | Add option to skip Action Cable | Rafael Mendonça França | 2015-12-14 | 2 | -2/+5 | |
| | | ||||||
* | | Add action_cable to rails/all and application.rb | Rafael Mendonça França | 2015-12-14 | 1 | -0/+1 | |
|/ | ||||||
* | Revert "Merge pull request #22569 from seuros/remove-test-case" | eileencodes | 2015-12-13 | 3 | -17/+16 | |
| | | | | | | | | | This reverts commit 9712a7a12b7f9e4dcef751ceda8a73c3f4beb11f, reversing changes made to 3e65c3d3886336e9145438cdeacaf4ebec6a48b8. Reverting because this caused test failures and while we have a followup branch there is still one failure that happens randomly and isn't straight forward to fix. | |||||
* | Merge pull request #22569 from seuros/remove-test-case | Eileen M. Uchitelle | 2015-12-13 | 3 | -16/+17 | |
|\ | | | | | Controller generators should be creating IntegrationTest stubs instea… | |||||
| * | Controller generators should be creating IntegrationTest stubs instead of ↵ | Abdelkader Boudih | 2015-12-13 | 3 | -16/+17 | |
| | | | | | | | | ControllerTest | |||||
* | | Merge pull request #22574 from gsamokovarov/scaffold-500 | Kasper Timm Hansen | 2015-12-13 | 2 | -2/+2 | |
|\ \ | | | | | | | Prevent a 500 in the default controller scaffold | |||||
| * | | Prevent a 500 in the default controller scaffold | Genadi Samokovarov | 2015-12-13 | 2 | -2/+2 | |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you update a record with no attributes, you'll hit a 500 from a guard in `assign_attributes` raising: ```ruby ArgumentError: When assigning attributes, you must pass a hash as an argument. app/controllers/users_controller.rb:44:in `block in update' app/controllers/users_controller.rb:43:in `update' test/controllers/users_controller_test.rb:37:in `block in <class:UsersControllerTest>' ``` Not a biggie, but may be quite confusing for the folks new to the framework. | |||||
* | | Merge pull request #22573 from gsamokovarov/web-console-3-0 | Kasper Timm Hansen | 2015-12-13 | 1 | -1/+1 | |
|\ \ | | | | | | | Update web-console to 3.0.0 | |||||
| * | | Update web-console to 3.0.0 | Genadi Samokovarov | 2015-12-13 | 1 | -1/+1 | |
| |/ | | | | | | | | | Web Console 3.0.0 is compatible with Rails 5, while the 2.x.x releases aren't. | |||||
* / | let config.file_watcher be the way to enable the evented file watcher | Xavier Noria | 2015-12-13 | 2 | -4/+4 | |
|/ | | | | | | | | | | | Before this commit, the sole presence of the Listen constant enabled the evented file watcher (unless listen resorted to the polling backend). This way, applications may depend on listen for other stuff independently of this feature. Also, allows teams with mixed setups to decide at boot time whether the evented watcher should be enabled for each particular instance. | |||||
* | We don't need to set config.debug_exception_response_format given that :api ↵ | Jorge Bejar | 2015-12-09 | 1 | -6/+0 | |
| | | | | is the default value for only API apps | |||||
* | Adjust comment in development.rb template file for app generator | Jorge Bejar | 2015-12-09 | 1 | -3/+0 | |
| | ||||||
* | Fix indent in generated Rails API env file | Jorge Bejar | 2015-12-09 | 1 | -6/+6 | |
| | ||||||
* | Add debug_exception_response_format config to configure DebugException | Jorge Bejar | 2015-12-09 | 1 | -0/+8 | |
| | | | | behavior | |||||
* | remove `request_forgery_protection` initializer from rails api | yuuji.yaginuma | 2015-12-06 | 1 | -0/+1 | |
| | | | | | In rails api, since default is so as not to use the `protect_from_forgery`, `request_forgery_protection` initializer I think that's unnecessary | |||||
* | add `bin/test` script to rails plugin | yuuji.yaginuma | 2015-11-28 | 3 | -3/+14 | |
| | ||||||
* | let the generated app Gemfile depend on listen 3.0.5 | Xavier Noria | 2015-11-26 | 1 | -1/+1 | |
| | | | | See https://github.com/rails/rails/commit/14b20ce9b38314943dcaf73b8dab7508b70ba487. | |||||
* | Merge pull request #22263 from mastahyeti/csrf-origin-check | Rafael França | 2015-11-26 | 1 | -0/+4 | |
|\ | | | | | | | | | Add option to verify Origin header in CSRF checks [Jeremy Daer + Rafael Mendonça França] | |||||
| * | Add option to verify Origin header in CSRF checks | Ben Toews | 2015-11-25 | 1 | -0/+4 | |
| | | ||||||
* | | Remove <br> from scaffold, in favor of using CSS | Sean Collins | 2015-11-25 | 2 | -3/+7 | |
| | | ||||||
* | | Merge pull request #22370 from yui-knk/remove_blank_line | Andrew White | 2015-11-24 | 1 | -1/+0 | |
|\ \ | | | | | | | Remove a blank line from a template for plugin `routes.rb` | |||||
| * | | Remove a blank line from a template for plugin `routes.rb` | yui-knk | 2015-11-22 | 1 | -1/+0 | |
| | | | ||||||
* | | | Merge pull request #22272 from y-yagi/remove_test_files_in_plugin_gemspec | Eileen M. Uchitelle | 2015-11-23 | 1 | -3/+0 | |
|\ \ \ | |/ / |/| | | don't package test files in plugin gemspec | |||||
| * | | don't package test files in plugin gemspec | yuuji.yaginuma | 2015-11-12 | 1 | -3/+0 | |
| |/ | | | | | | | | | | | | | | | In rails engine, there is a dummy application under test, the size of the test file is increased. However, there is no need test files for most users, I think it good to have so as not included by default. | |||||
* | | upgrade listen to 3.0.4 | Xavier Noria | 2015-11-08 | 1 | -1/+1 | |
| | | | | | | | | 3.0.3 has a bug in OS X. | |||||
* | | move the listen gem in the Gemfile to the development group | Xavier Noria | 2015-11-08 | 1 | -3/+4 | |
| | | ||||||
* | | implements an evented file update checker [Puneet Agarwal] | Xavier Noria | 2015-11-08 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This is the implementation of the file update checker written by Puneet Agarwal for GSoC 2015 (except for the tiny version of the listen gem, which was 3.0.2 in the original patch). Puneet's branch became too out of sync with upstream. This is the final work in one single clean commit. Credit goes in the first line using a convention understood by the contrib app. | |||||
* | | fix application_controller require_dependency path generated by api scaffold ↵ | yuuji.yaginuma | 2015-11-08 | 1 | -1/+1 | |
|/ | | | | | | | | | generator In the app generator, regardless of the namespace, it is adapted to read the same `application_controller.rb`, modified to api generator also be the same behavior. ref 686966a1861e6761021d45f6795de753e8a62216, 06ac63b4c602e4b26cb3bfbf0dfd2bed8b00e786 | |||||
* | [ci skip] Remove final mentions of `static_cache_control` in docs. | Kasper Timm Hansen | 2015-11-05 | 1 | -1/+3 | |
| | | | | | | It was deprecated in https://github.com/rails/rails/pull/19135. We're now favoring `public_file_server.headers`. | |||||
* | Add enabled flag to the public file server. | Kasper Timm Hansen | 2015-11-03 | 2 | -3/+3 | |
| | | | | | | | | As discussed in https://github.com/rails/rails/pull/19135#issuecomment-153385986. Replaces `serve_static_files` to unify the static options under the `public_file_server` wing. Deprecates `serve_static_files` accessors, but make them use the newer config internally. | |||||
* | added missing instructions for `rack-cors` | Gaurav Sharma | 2015-11-03 | 1 | -2/+4 | |
| | | | | | `config.middleware.insert_before` changes require to restart the server Also added missing `.` at the EOL. | |||||
* | Merge pull request #22152 from y-yagi/remove_sass-cache_from_gitignore | Andrew White | 2015-11-02 | 1 | -1/+0 | |
|\ | | | | | remove unnecessary `.sass-cache` from plugin's gitignore template | |||||
| * | remove unnecessary `.sass-cache` from plugin's gitignore template | yuuji.yaginuma | 2015-11-02 | 1 | -1/+0 | |
| | | | | | | | | Since the sass cache is output to the `tmp/cache/sass`. | |||||
* | | Route generator should be idempotent - closes #22082 | Thiago Pinto | 2015-10-31 | 1 | -1/+1 | |
|/ | ||||||
* | Add version constraint to database gem in generated application | Rafael Mendonça França | 2015-10-29 | 3 | -13/+24 | |
| | | | | | | We are using the same version constraint in the database adapters so when a new version of the adapter that doesn't work with the version of rails is released we don't break new applications. | |||||
* | Properly indent '<head>' and '<body>' within '<html>' | Sean Collins | 2015-10-29 | 1 | -16/+17 | |
| | ||||||
* | Move default uuid generation to active_record | Jon McCartie | 2015-10-23 | 1 | -5/+0 | |
| | ||||||
* | remove unnecessary readme in dummy application | yuuji.yaginuma | 2015-10-23 | 1 | -1/+1 | |
| | | | | `README` it is changed to `README.rdoc` in 6b126e2, it has been changed to` README.md` further 89a12c9. | |||||
* | Revert " Added an example to show how common secrets can be shared across ↵ | Sean Griffin | 2015-10-20 | 1 | -16/+0 | |
| | | | | multiple environments in secrets.yml" | |||||
* | Merge pull request #19898 from prathamesh-sonpatki/common-secrets | Sean Griffin | 2015-10-20 | 1 | -0/+16 | |
|\ | | | | | Added an example to show how common secrets can be shared across multiple environments in secrets.yml [ci skip] | |||||
| * | Added example of sharing secrets in multiple environments in secrets.yml | Prathamesh Sonpatki | 2015-05-26 | 1 | -0/+16 | |
| | | ||||||
* | | Set active_record config for always creating uuids in generators | Jon McCartie | 2015-10-20 | 1 | -0/+5 | |
| | | ||||||
* | | remove useless method | yuuji.yaginuma | 2015-10-18 | 1 | -4/+0 | |
| | | | | | | | | `images` method has been deleted in 2bc4856, `create_images_directory` does nothing. | |||||
* | | Use "rake time:zones:all" instead of "rake -D time" [ci skip] | Marat Galiev | 2015-10-17 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #21961 from Gaurav2728/migration_class_methods_nodoc | Arthur Nogueira Neves | 2015-10-14 | 1 | -5/+5 | |
|\ \ | | | | | | | migrations Class methods have nodoc, fix it for API [ci skip] | |||||
| * | | migrations Class methods have nodoc, fix it for API [ci skip] | Gaurav Sharma | 2015-10-14 | 1 | -5/+5 | |
| | | | ||||||
* | | | Merge pull request #20908 from y-yagi/generate_application_job_inside_engine | Arthur Nogueira Neves | 2015-10-13 | 1 | -0/+5 | |
|\ \ \ | | | | | | | | | add application_job.rb to template of mountable engine |