aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove mention of deprecated SafeERB gem from security docs for now, prior ↵Vipul A M2016-11-181-1/+1
| | | | | section already speaks about sanitization as a safety measure. [ci skip] (#27086) Fixes #27085
* Merge pull request #27084 from vipulnsward/fix-connection-config-mutationKasper Timm Hansen2016-11-171-3/+3
|\ | | | | Fix mucking of connection_config leading to issues in prepared_statements issues
| * Fix mucking of connection_config leading to issues in prepared_statementsVipul A M2016-11-171-3/+3
|/
* Merge pull request #27078 from vipulnsward/fix-pg-prepared-statement-testKasper Timm Hansen2016-11-171-1/+2
|\ | | | | Fix PG prepared statement test
| * Fix PG prepared statement testVipul A M2016-11-171-1/+2
|/
* Merge pull request #27075 from maclover7/jm-jruby-activejobRafael França2016-11-161-4/+4
|\ | | | | Enable JRuby testing for Active Job
| * Make JRUBY_OPTS a global Travis environment variableJon Moss2016-11-161-2/+2
| |
| * Enable JRuby testing for Active JobJon Moss2016-11-161-2/+2
|/ | | | All tests pass for me locally.
* Merge pull request #27072 from ↵Rafael França2016-11-161-8/+8
|\ | | | | | | | | maxboisvert/use_named_parameters_in_assert_enqueued_with Use named parameters instead of `assert_valid_keys` in active_job/test_helper
| * Use named parameters instead of `assert_valid_keys`Maxime Boisvert2016-11-161-8/+8
| |
* | Merge pull request #27064 from koic/bump_ruby_versionsRafael França2016-11-161-3/+3
|\ \ | | | | | | Run tests by Ruby 2.2.6 and 2.3.2
| * | Run tests by Ruby 2.2.6 and 2.3.2Koichi ITO2016-11-161-3/+3
| |/
* | Merge pull request #27074 from maclover7/jm-jruby-actionmailerRafael França2016-11-161-0/+5
|\ \ | |/ |/| Enable JRuby testing for Action Mailer
| * Enable JRuby testing for Action MailerJon Moss2016-11-161-0/+5
|/ | | | | | | | All tests passing locally for me: ``` 195 runs, 441 assertions, 0 failures, 0 errors, 0 skips ```
* docs, add `update_all` example with SQL fragment. [ci skip]Yves Senn2016-11-161-0/+3
| | | | | | The relation method `update_all` allows you to pass a SQL fragment. The functionality is already mentioned in the prose but the examples section does not cover it.
* Merge pull request #27056 from kirs/fix-testing-isolationGuillermo Iguaran2016-11-151-1/+2
|\ | | | | Fix testing isolation
| * Fix testing isolationKir Shatrov2016-11-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AS::Testing::Isolation has two ways to isolate the process: forking and subprocessing. The second way is used on JRuby and other platforms that don't support forking. The way how subprocessing works is that we prepare a command to run a new process: ``` /opt/rubies/2.3.0/bin/ruby -I{skipped_load_path} test/initializable_test.rb '' -nInitializableTests::Basic#test_Initializer_provides_context's_class_name ``` As you see, there's unescaped quote at the end of the line. It leads to: ``` sh: -c: line 0: unexpected EOF while looking for matching `'' sh: -c: line 1: syntax error: unexpected end of file ``` This fixes tests on MRI + NO_FORK variable and on JRuby :tada:
* | Merge pull request #27058 from maclover7/jm-fix-26904Jon Moss2016-11-153-0/+19
|\ \ | | | | | | Support AC::Parameters for PG HStore
| * | Support AC::Parameters for PG HStoreJon Moss2016-11-153-0/+19
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | As reported via #26904, there is a regression in how values for Postgres' HStore column type are being processed, beginning in Rails 5. Currently, the way that Active Record checks whether or not values need to be serialized and put into the correct storage format is whether or not it is a `Hash` object. Since `ActionController::Parameters` no longer inherits from `Hash` in Rails 5, this conditional now returns false. To remedy this, we are now checking to see whether the `value` parameters being passed in responds to a certain method, and then calling the `serialize` method, except this time with a real Hash object. Keeping things DRY! Fixes #26904.
* | Merge pull request #27054 from kamipo/null_relation_calculateSean Griffin2016-11-151-5/+4
|\ \ | |/ |/| Refactor `NullRelation#calculate`
| * Refactor `NullRelation#calculate`Ryuta Kamizono2016-11-161-5/+4
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: ```ruby def calculate(operation, _column_name) if [:count, :sum].include? operation group_values.any? ? Hash.new : 0 elsif [:average, :minimum, :maximum].include?(operation) && group_values.any? Hash.new else nil end end ``` After: ```ruby def calculate(operation, _column_name) case operation when :count, :sum group_values.any? ? Hash.new : 0 when :average, :minimum, :maximum group_values.any? ? Hash.new : nil end end ```
* Make sure to bundle json 2.x on CIAkira Matsuda2016-11-152-0/+4
| | | | | Without this, bundler tries to bundle json 1.8 on Ruby 2.4 in some cases https://travis-ci.org/rails/rails/jobs/175874852
* Merge pull request #27048 from y-yagi/remove_alias_method_chain_from_guideप्रथमेश Sonpatki2016-11-151-50/+0
|\ | | | | remove `alias_method_chain` from guide [ci skip]
| * remove `alias_method_chain` from guide [ci skip]yuuji.yaginuma2016-11-151-50/+0
| | | | | | | | Follow up to 7c848e6dd493ff236d33a0410a92f4c3e5cc3c7f
* | Merge pull request #27047 from y-yagi/remove_duplicated_entryRafael França2016-11-141-4/+0
|\ \ | |/ |/| remove duplicated changelog entry [ci skip]
| * remove duplicated changelog entry [ci skip]yuuji.yaginuma2016-11-151-4/+0
|/
* Merge pull request #27046 from conradbeach/fix-typo-layouts-and-rendering-guideJon Moss2016-11-141-1/+1
|\ | | | | Fix small typo in Layouts and Rendering guide.
| * Fix small typo in Layouts and Rendering guide. [ci skip]Conrad Beach2016-11-141-1/+1
| | | | | | Changed "same way they do" to "same way they are".
* | Missing require string/filters for `squish`Akira Matsuda2016-11-151-0/+2
|/
* Merge pull request #27035 from rails/remove-active-support-deprecationsAndrew White2016-11-1430-685/+76
|\ | | | | Remove Active Support deprecations
| * Remove deprecated class ActiveSupport::Concurrency::LatchAndrew White2016-11-142-25/+4
| |
| * Remove deprecated separator argument from parameterizeAndrew White2016-11-145-44/+6
| |
| * Remove deprecated method Numeric#to_formatted_sAndrew White2016-11-143-11/+4
| |
| * Remove deprecated method alias_method_chainAndrew White2016-11-143-263/+4
| |
| * Remove deprecated constant MissingSourceFIleAndrew White2016-11-143-10/+4
| |
| * Remove deprecated Module.qualified_const_get/set/defined?Andrew White2016-11-145-190/+5
| |
| * Update CHANGELOGAndrew White2016-11-131-0/+48
| |
| * Remove deprecated :prefix optionAndrew White2016-11-133-37/+1
| |
| * Remove deprecated new_from_hash_copying_defaultAndrew White2016-11-132-16/+0
| |
| * Remove deprecated time marshal core_ext fileAndrew White2016-11-131-3/+0
| |
| * Remove deprecated struct core_ext fileAndrew White2016-11-131-3/+0
| |
| * Remove deprecated module method_transplanting fileAndrew White2016-11-131-3/+0
| |
| * Remove deprecated local_constantsAndrew White2016-11-132-18/+0
| |
| * Remove deprecated kernel debugger fileAndrew White2016-11-131-3/+0
| |
| * Remove deprecated namespaced_keyAndrew White2016-11-132-14/+0
| |
| * Remove deprecated set_cache_valueAndrew White2016-11-132-17/+0
| |
| * Remove deprecated escape_keyAndrew White2016-11-132-14/+0
| |
| * Remove deprecated key_file_pathAndrew White2016-11-132-14/+0
| |
* | Merge pull request #27040 from ↵Rafael França2016-11-143-1/+13
|\ \ | | | | | | | | | | | | ttanimichi/add-skip-sprockets-to-passthrough-options Add `:skip_sprockets` to `Rails::PluginBuilder::PASSTHROUGH_OPTIONS`
| * | Add `:skip_sprockets` to `Rails::PluginBuilder::PASSTHROUGH_OPTIONS`Tsukuru Tanimichi2016-11-143-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `rails plugin new` with `--full` and `--skip-sprockets` options generates a dummy application that throws `NoMethodError`. ``` % rails plugin new my_engine -S --full --skip-gemspec % cd my_engine % bin/rails test rails aborted! NoMethodError: undefined method `assets' for #<Rails::Application::Configuration:0x007f83aa1e6100> ```
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 05:55:30 +0000