aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
* allow use of minitest-rails gem with test runnerChris Kottom2015-11-301-1/+1
|
* add `bin/test` script to rails pluginyuuji.yaginuma2015-11-284-6/+18
|
* let the generated app Gemfile depend on listen 3.0.5Xavier Noria2015-11-261-1/+1
| | | | See https://github.com/rails/rails/commit/14b20ce9b38314943dcaf73b8dab7508b70ba487.
* Merge pull request #22263 from mastahyeti/csrf-origin-checkRafael França2015-11-261-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 checksBen Toews2015-11-251-0/+4
| |
* | Merge pull request #22401 from cllns/remove-br-from-scaffoldKasper Timm Hansen2015-11-252-3/+7
|\ \ | | | | | | Remove <br> from scaffold form, in favor of using CSS
| * | Remove <br> from scaffold, in favor of using CSSSean Collins2015-11-252-3/+7
| | |
* | | Merge pull request #22290 from y-yagi/donot_show_test_unit_jobEileen M. Uchitelle2015-11-251-0/+1
|\ \ \ | |/ / |/| | do not show Active Job test generator
| * | do not show Active Job test generatoryuuji.yaginuma2015-11-141-0/+1
| | | | | | | | | | | | | | | Like the other generator, for also Active Job, I think that there is no need to display for test generator.
* | | Merge pull request #22370 from yui-knk/remove_blank_lineAndrew White2015-11-241-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-knk2015-11-221-1/+0
| | | |
* | | | Merge pull request #22287 from dharamgollapudi/patch-2Rafael França2015-11-241-2/+1
|\ \ \ \ | | | | | | | | | | Move the desc one level up
| * | | | Move the desc one level up Dharam Gollapudi2015-11-131-2/+1
| | |/ / | |/| | | | | | Make the task visible (from rake -T) by moving the desc one level up
* | | | Merge pull request #22272 from y-yagi/remove_test_files_in_plugin_gemspecEileen M. Uchitelle2015-11-231-3/+0
|\ \ \ \ | |_|/ / |/| | | don't package test files in plugin gemspec
| * | | don't package test files in plugin gemspecyuuji.yaginuma2015-11-121-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.
* | | Make the `static_index` config part of the `config.public_server` configYuki Nishijima2015-11-162-3/+3
| |/ |/| | | | | Also call it `public_server.index_name` so it'll make more sense.
* | Prefer Minitest's location for test failures.Kasper Timm Hansen2015-11-121-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running tests, the Rails test runner would report the start of the test method as the test failure. For this test: ```ruby 1 require 'test_helper 2 3 class BunnyTest < ActiveSupport::TestCase 4 test "something failing" do 5 assert false, 'This failed' 6 end 7 end ``` The runner outputs 5 instead of 4: ``` ............................................F This failed bin/rails test test/models/bunny_test.rb:5 ........ ```
* | encapsulates the logic to choose the file monitor in app configXavier Noria2015-11-101-1/+9
| |
* | upgrade listen to 3.0.4Xavier Noria2015-11-081-1/+1
| | | | | | | | 3.0.3 has a bug in OS X.
* | move the listen gem in the Gemfile to the development groupXavier Noria2015-11-081-3/+4
| |
* | implements an evented file update checker [Puneet Agarwal]Xavier Noria2015-11-082-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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.yaginuma2015-11-081-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 Hansen2015-11-051-1/+3
| | | | | | It was deprecated in https://github.com/rails/rails/pull/19135. We're now favoring `public_file_server.headers`.
* Fix `static_cache_control` deprecation warningJon Atack2015-11-051-3/+6
| | | | | | | | | | | | | | | | | | | | | | 1. Fix the message by wrapping the value in missing quotes and adding the missing backtick at the end. Finally, :lipstick: by adding a space inside the curly braces. Before: `config.public_file_server.headers = {'Cache-Control' => public, max-age=31536000} Now: `config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=31536000' }` 2. Display `static_cache_control` instead of static_cache_control. This follows what the 2 neighboring methods are doing. 3. Use strip_heredoc to improve the code formatting and readability like the 2 neighboring methods and wrap to 80 characters.
* Add enabled flag to the public file server.Kasper Timm Hansen2015-11-034-6/+27
| | | | | | | | 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 Sharma2015-11-031-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_gitignoreAndrew White2015-11-021-1/+0
|\ | | | | remove unnecessary `.sass-cache` from plugin's gitignore template
| * remove unnecessary `.sass-cache` from plugin's gitignore templateyuuji.yaginuma2015-11-021-1/+0
| | | | | | | | Since the sass cache is output to the `tmp/cache/sass`.
* | Route generator should be idempotent - closes #22082Thiago Pinto2015-10-311-1/+1
|/
* rails/application: allow passing an env to config_forSimon Eskildsen2015-10-301-2/+2
|
* Add version constraint to database gem in generated applicationRafael Mendonça França2015-10-293-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 Collins2015-10-291-16/+17
|
* Merge pull request #21998 from kddeisz/rake_task_statisticsArthur Nogueira Neves2015-10-283-1/+3
|\ | | | | Allow rake:stats to account for rake tasks
| * Allow rake:stats to account for rake tasksKevin Deisz2015-10-193-1/+3
| |
* | raise `ArgumentError` when `SECRET_KEY_BASE` is an integerArun Agrawal2015-10-271-0/+3
| | | | | | | | | | | | | | If `SECRET_KEY_BASE` or other `secret` gets passed as other then string we need to raise `ArgumentError` to know that it's a wrong argument. Closes #22072
* | Move default uuid generation to active_recordJon McCartie2015-10-231-5/+0
| |
* | remove unnecessary readme in dummy applicationyuuji.yaginuma2015-10-231-1/+1
| | | | | | | | `README` it is changed to `README.rdoc` in 6b126e2, it has been changed to` README.md` further 89a12c9.
* | `config.generators` should be docummented since it is public APIRafael Mendonça França2015-10-221-1/+1
| | | | | | | | [ci skip]
* | Revert " Added an example to show how common secrets can be shared across ↵Sean Griffin2015-10-201-16/+0
| | | | | | | | multiple environments in secrets.yml"
* | Merge pull request #19898 from prathamesh-sonpatki/common-secretsSean Griffin2015-10-201-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.ymlPrathamesh Sonpatki2015-05-261-0/+16
| | |
* | | Set active_record config for always creating uuids in generatorsJon McCartie2015-10-201-0/+5
| | |
* | | Merge pull request #21978 from ctreatma/console_helper_reloadSean Griffin2015-10-191-1/+1
|\ \ \ | |_|/ |/| | Fix #21977: Removes memoization of helpers in Rails console
| * | Fix #21977: Removes memoization of helpers in Rails consoleCharles Treatman2015-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | In the Rails console, the `helper` function provides a shorthand for working with application helpers. However, `helper` memoizes the value of `ApplicationController#helpers`. This means that if a user subsequently changes helper code and calls `reload!` in the console, their code changes will not be reflected by the `helper` function, even though the helper was, in fact, reloaded.
* | | remove useless methodyuuji.yaginuma2015-10-181-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 Galiev2015-10-171-1/+1
|/ /
* | Merge pull request #21961 from Gaurav2728/migration_class_methods_nodocArthur Nogueira Neves2015-10-141-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 Sharma2015-10-141-5/+5
| | |
* | | Merge pull request #20908 from y-yagi/generate_application_job_inside_engineArthur Nogueira Neves2015-10-131-0/+5
|\ \ \ | | | | | | | | add application_job.rb to template of mountable engine
| * | | add application_job.rb to template of mountable engineyuuji.yaginuma2015-07-171-0/+5
| | | | | | | | | | | | | | | | | | | | since cb012467214f6e4bb1ac3987554bb75020b4796b, generated job inherents from ApplicationJob, ApplicationJob is required in the mountable engine.