aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix typo in actionview error messageadamgamble2017-03-171-1/+1
|
* Fix test warningsAndrew White2017-03-161-5/+5
|
* Move `to_time` to `DateTime` compatibility.rb fileAndrew White2017-03-164-6/+16
| | | | | | We are overriding it in `Time` and `ActiveSupport::TimeWithZone` so there's no point in having it in the `DateAndTime::Compatibility` module. Also add some docs for the `to_time` implementations.
* Merge pull request #28147 from kmcphillips/master-time-freezeAndrew White2017-03-166-22/+206
|\ | | | | Allow Time#to_time on frozen objects. Return frozen time rather than "RuntimeError: can't modify frozen Time"
| * Handle #to_time and memoization taking into account memoization, frozen ↵Kevin McPhillips2017-03-066-22/+206
| | | | | | | | state, and preserve_timezone flag.
* | Merge pull request #28368 from y-yagi/add_test_for_secrets_commandKasper Timm Hansen2017-03-151-0/+13
|\ \ | | | | | | Add secrets edit test
| * | Add secrets edit testyuuji.yaginuma2017-03-121-0/+13
| | |
* | | Tweak 28412Jon Moss2017-03-151-1/+1
| | | | | | | | | | | | | | | | | | PR was merged before I could finished reviewing :grimacing: [ci skip]
* | | Remove unnecessary params mungingAndrew White2017-03-152-2/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 9b654d4 some params munging was added to ensure that they were set whenever `recognize_path` would call either a proc or callable constraint. Since we no longer mutate the environment hash within the method it's now unnecessary and actually causes params to leak between route matches before checking constraints. Fixes #28398.
* | | Revert #27850 following test breakage (#28427)David Heinemeier Hansson2017-03-153-19/+7
| | |
* | | Merge pull request #28426 from mtsmfm/fix-fragile-testRafael França2017-03-151-36/+34
|\ \ \ | | | | | | | | Fix fragile test (`AssociationProxyTest#test_save_on_parent_saves_children`)
| * | | Fix fragile test (`AssociationProxyTest#test_save_on_parent_saves_children`)Fumiaki MATSUSHIMA2017-03-161-36/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we run only following tests: - test/cases/scoping/default_scoping_test.rb - test/cases/associations_test.rb ``` $ cat Rakefile.test require "rake/testtask" ENV["ARCONN"] = "postgresql" Rake::TestTask.new do |t| t.libs << "test" t.test_files = %w( test/cases/scoping/default_scoping_test.rb test/cases/associations_test.rb ) end ``` a test will fail: ``` $ bundle exec rake test -f Rakefile.test /app/activesupport/lib/active_support/core_ext/enumerable.rb:20: warning: method redefined; discarding old sum Using postgresql Run options: --seed 11830 # Running: .........................................................................................F................ Finished in 6.939055s, 15.2759 runs/s, 27.9577 assertions/s. 1) Failure: AssociationProxyTest#test_save_on_parent_saves_children [/app/activerecord/test/cases/associations_test.rb:185]: Expected: 1 Actual: 2 106 runs, 194 assertions, 1 failures, 0 errors, 0 skips rake aborted! Command failed with status (1) /usr/local/bin/bundle:22:in `load' /usr/local/bin/bundle:22:in `<main>' Tasks: TOP => test (See full trace by running task with --trace) ``` In #28083, change `self.use_transactional_tests` to `false` but we forget to clean-up fixture. However we don't have to disable transaction except a few tests.
* | | | Merge pull request #28425 from rails/remove-duration-deprecationAndrew White2017-03-155-38/+214
|\ \ \ \ | | | | | | | | | | Remove implicit coercion deprecation of durations
| * | | | Restore 5.minutes changed in #28204Andrew White2017-03-151-1/+1
| | | | |
| * | | | Use better duration aliases in testsAndrew White2017-03-151-2/+2
| | | | |
| * | | | Remove implicit coercion deprecation of durationsAndrew White2017-03-153-35/+211
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In #28204 we deprecated implicit conversion of durations to a numeric which represented the number of seconds in the duration because of unwanted side effects with calculations on durations and dates. This unfortunately had the side effect of forcing a explicit cast when configuring third-party libraries like expiration in Redis, e.g: redis.expire("foo", 5.minutes) To work around this we've removed the deprecation and added a private class that wraps the numeric and can perform calculation involving durations and ensure that they remain a duration irrespective of the order of operations.
* | | | Merge pull request #28412 from benoittgt/add_doc_for_message_encryptor_newRafael França2017-03-151-0/+5
|\ \ \ \ | |/ / / |/| | | Add documentation about signature_key for MessageEncryptor.new [ci skip]
| * | | Add documentation about signature_key for MessageEncryptor.new [ci skip]Benoit Tigeot2017-03-151-0/+5
| | | |
* | | | Merge pull request #28423 from eugeneius/rm_txnRichard Schneeman2017-03-152-2/+0
|\ \ \ \ | | | | | | | | | | Remove unused `@txn` variable
| * | | | Remove unused `@txn` variableEugene Kenny2017-03-152-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was added in c24c885209ac2334dc6f798c394a821ee270bec6, removed in b89ffe7f0047eb614e42232a21201b317b880755, and then (unintentionally?) reintroduced in 2d7ae1b08ee2a10b12cbfeef3a6cc6da55b57df6.
* | | | | Merge pull request #28409 from y-yagi/make_destroy_command_work_within_enginesEileen M. Uchitelle2017-03-152-2/+57
|\ \ \ \ \ | | | | | | | | | | | | Make destroy command work within engines
| * | | | | Make destroy command work within enginesyuuji.yaginuma2017-03-142-2/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of calling methods of Rails.application directly, we need to use a method that is considered for the rails engine.
* | | | | | Merge pull request #28422 from ↵Kasper Timm Hansen2017-03-151-7/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | y-yagi/rename_app_update_test_to_more_appropriate_name Rename test of `app:update` to more appropriate name
| * | | | | Rename test of `app:update` to more appropriate nameyuuji.yaginuma2017-03-151-7/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | `rails:update` was changed to `app:update` in 6fb31638c8b61731103d4963272755b217a2df87. Therefore, I think that it is better that the test name is also `app_update`.
* | | | | Don't cast to float unnecessarilyAndrew White2017-03-151-2/+2
| | | | | | | | | | | | | | | | | | | | Adding durations to `Time` instances is perfectly okay.
* | | | | Merge pull request #28420 from claudiob/changelog-skip-coffeeClaudio B2017-03-141-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Add CHANGELOG entry for --skip-coffee [ci skip]
| * | | | | Add CHANGELOG entry for --skip-coffee [ci skip]claudiob2017-03-141-0/+4
|/ / / / / | | | | | | | | | | | | | | | Was added in #25248 by @bluesh55
* | | | | Merge pull request #28410 from fphilipe/remove-obsolete-warning-in-guidesRyuta Kamizono2017-03-141-3/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove obsolete warning about regular expression
| * | | | | Remove obsolete warning about regular expressionPhilipe Fatio2017-03-141-3/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This warning became obsolete when the regular expression was changed to use `\z` instead of `\Z` in fce9c4e5e1ecb31cff2ca43a04fbe332816c3c45. "-1234\n" =~ /\A[+-]?\d+\Z/ => 0 "-1234\n" =~ /\A[+-]?\d+\z/ => nil [ci skip]
* | | | | Revert "Merge pull request #28369 from ↵Matthew Draper2017-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mylake/reduce-postgresql-adapter-memory-bloat" This reverts commit 192db64452d148c7b51713979459e38407380dc6, reversing changes made to 9893955363cf6358556ed3b36f4538d5b54e9d17. We can't sacrifice correctness for performance.
* | | | | Merge pull request #28407 from claudiob/changelog-skip-pipelineRichard Schneeman2017-03-131-0/+17
|\ \ \ \ \ | | | | | | | | | | | | Add CHANGELOG for #26226 [ci skip]
| * | | | | Add CHANGELOG for #26226 [ci skip]claudiob2017-03-131-0/+17
| | | | | |
* | | | | | Merge pull request #28369 from mylake/reduce-postgresql-adapter-memory-bloatRafael França2017-03-131-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | 500x memory reduction of 10k schemas for postgresql adapter
| * | | | | | Use “distinct” to filter redundant types from pg_typeto reduce memory ↵mylake2017-03-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | bloat especially in multi-schema structure database
* | | | | | | Merge pull request #28356 from jasl/patch-1Rafael França2017-03-131-9/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove non-exists method delegation
| * | | | | | | Remove non-exists method delegation and correct docjasl2017-03-111-9/+1
| | | | | | | |
* | | | | | | | Merge pull request #28068 from kamipo/refactor_data_sourcesRafael França2017-03-138-205/+156
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Extract `data_source_sql` to refactor data source statements
| * | | | | | | | Prefer `USING (column_list)` for joining information_schemaRyuta Kamizono2017-02-251-3/+1
| | | | | | | | |
| * | | | | | | | Extract `data_source_sql` to refactor data source statementsRyuta Kamizono2017-02-208-202/+155
| | | | | | | | |
* | | | | | | | | Move "fixes" to a new lineJon Moss2017-03-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Lint activesupport/CHANGELOG.mdJon Moss2017-03-131-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Small grammar change + new line for "fixes"Jon Moss2017-03-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Small grammar changeJon Moss2017-03-131-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reads easier, and removes extra tick marks. [ci skip]
* | | | | | | | | Merge pull request #28404 from olimart/masterJon Moss2017-03-131-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix Typo [ci skip]
| * | | | | | | | | Fix Typo [ci skip]Olivier2017-03-131-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | Arcticle --> Article
* | | | | | | | | Fix HTTPS grammarJon Moss2017-03-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge pull request #28381 from shime/docs-action-controller-baseVipul A M2017-03-1321-55/+55
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [docs] fix ActionController docs
| * | | | | | | | | [docs] fix ActionController documentationHrvoje Šimić2017-03-1221-55/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Merge pull request #28385 from javan/actioncable/fix-npm-packageGuillermo Iguaran2017-03-133-1/+38
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | Restore action_cable.js UMD module support. Fixes #28366
| * | | | | | | | | Restore action_cable.js UMD module support. Fixes #28366Javan Makhmali2017-03-113-1/+38
| | | | | | | | | |