aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* allow use of minitest-rails gem with test runnerChris Kottom2015-11-302-1/+7
|
* add `bin/test` script to rails pluginyuuji.yaginuma2015-11-287-7/+153
|
* 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-164-7/+12
| |/ |/| | | | | Also call it `public_server.index_name` so it'll make more sense.
* | Prefer Minitest's location for test failures.Kasper Timm Hansen2015-11-122-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ........ ```
* | Don't match specific line numbers in reporter tests.Kasper Timm Hansen2015-11-121-4/+4
| | | | | | | | The overall syntax of the file path is more important, not the exact line it was on.
* | registers these changes in the CHANGELOGsXavier Noria2015-11-111-0/+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-082-1/+25
|/ | | | | | | | | 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.
* Replace `serve_static_files` in tests with `public_file_server.enabled`.Kasper Timm Hansen2015-11-044-5/+5
| | | | Forgot to do it in 748b2f9, when deprecating `serve_static_files`.
* Merge pull request #22173 from kaspth/enable-public-file-serverKasper Timm Hansen2015-11-046-12/+84
|\ | | | | Add enabled flag to the public file server settings.
| * Move `static_cache_contorl` deprecation changelog entry to Railties.Kasper Timm Hansen2015-11-041-0/+22
| | | | | | | | | | | | | | The configuration for `config.static_cache_control`, and its replacement `config.public_file_server.headers` are implemented in Railties. People would configure this in environment files, which is Railties domain too.
| * Add enabled flag to the public file server.Kasper Timm Hansen2015-11-036-12/+62
| | | | | | | | | | | | | | | | 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.
* | don't start a new process for every test fileAaron Patterson2015-11-031-8/+21
|/ | | | | | | we can just reuse the parent process. We should figure out what files are commonly required among the test files and try to require them in the parent so that the require time cost is amortized across the processes.
* 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.
* Make `db:migrate:status` to render `1_some.rb` format migrate files.yui-knk2015-11-021-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `1_valid_people_have_last_names.rb` and `20150823202140_create_users.rb` are valid migration file name. But `1_valid_people_have_last_names.rb` is rendered as `********** NO FILE **********` when `rake db:migrate:status`. Fix to this bug, this commit includes * define some API private methdos and a Constant `match_to_migration_filename?`, `parse_migration_filename`, and `MigrationFilenameRegexp` * use these methods in `db:migrate:status` task Example: These files are in `db/migrate` * 1_valid_people_have_last_names.rb * 20150819202140_irreversible_migration.rb * 20150823202140_add_admin_flag_to_users.rb * 20150823202141_migration_tests.rb * 2_we_need_reminders.rb * 3_innocent_jointable.rb we can migrate all of them. Before ```shell $ bundle exec rake db:migrate:status ... Status Migration ID Migration Name -------------------------------------------------- up 001 ********** NO FILE ********** up 002 ********** NO FILE ********** up 003 ********** NO FILE ********** up 20150819202140 Irreversible migration up 20150823202140 Add admin flag to users up 20150823202141 Migration tests ``` After ```shell $ bundle exec rake db:migrate:status ... Status Migration ID Migration Name -------------------------------------------------- up 001 Valid people have last names up 002 We need reminders up 003 Innocent jointable up 20150819202140 Irreversible migration up 20150823202140 Add admin flag to users up 20150823202141 Migration tests ```
* 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-313-1/+20
|/
* rails/application: allow passing an env to config_forSimon Eskildsen2015-10-303-2/+22
|
* Add version constraint to database gem in generated applicationRafael Mendonça França2015-10-294-17/+32
| | | | | | 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-285-1/+23
|\ | | | | Allow rake:stats to account for rake tasks
| * Allow rake:stats to account for rake tasksKevin Deisz2015-10-195-1/+23
| |
* | raise `ArgumentError` when `SECRET_KEY_BASE` is an integerArun Agrawal2015-10-272-0/+16
| | | | | | | | | | | | | | 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
* | Merge pull request #19924 from iamvery/db-tasks-exit-statusSean Griffin2015-10-261-0/+52
|\ \ | | | | | | | | | Explicitly exit with status "1" for create and drop failures
| * | Exit with non-zero status when db:drop failsJay Hayes2015-10-201-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * If the drop task fails for a reason other than the database not existing, processing should end. This is indicated by a non-zero exit status. * Since the backtrace is already printed to screen, we forgo printing it again by using an explicit call to `exit`. * :warning: This modifies the behavior of the db:create task slightly in that the stack trace is no longer printed by default. If the `--trace` option is used, it will print the trace _after_ the error message.
| * | Exit with non-zero status when db:create failsJay Hayes2015-10-201-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * If the create task fails for a reason other than the database already existing, processing should end. This is indicated by a non-zero exit status. * Since the backtrace is already printed to screen, we forgo printing it again by using an explicit call to `exit`. * :warning: This modifies the behavior of the db:create task slightly in that the stack trace is no longer printed by default. If the `--trace` option is used, it will print the trace _after_ the error message.
| * | Fix test of drop failureJay Hayes2015-10-201-4/+1
| | | | | | | | | | | | | | | | | | | | | * Previously the sqlite3 adapter could not "fail" on drop. Now an error is raised when no file exists. * Also updates purge to be resilient of drop failures. This is how purge is expected to behave.
| * | Add tests to verify exit status for create/drop failuresJay Hayes2015-10-201-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Running the db:create task when the database already exists isn't really an error case. That is processing may proceed in this case because the database exists as requested. So let's validate that behavior with a test. * Likewise, if the database doesn't exist when running the db:drop task processing may continue as the requested condition is already met. Thus a test.
* | | Tweaked wording used in some tests.Sebastian McKenzie2015-10-251-3/+3
| | |
* | | Use thor class_option to make the primary_key_type option workRafael Mendonça França2015-10-232-6/+10
| | | | | | | | | | | | Also move the method to the right class
* | | Move default uuid generation to active_recordJon McCartie2015-10-232-8/+4
| | |