aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* test with latest resqueyuuji.yaginuma2016-07-052-8/+13
| | | | | | | | | | | | | | | | | | | When run test of Active Job with resque 1.26, occurs following error. ``` QueuingTest#test_current_locale_is_kept_while_running_perform_later: NoMethodError: undefined method `current_tags' for #<Resque::QuietFormatter:0x0055b44f63ed50> /home/yaginuma/program/rails/master_y_yagi/rails/activejob/lib/active_job/logging.rb:51:in `logger_tagged_by_active_job?' ``` This was happening for the formatter class of resque not the formatter class of Rails is they've been used to logger.formatter. This was happening because become fomatter is changed during the instantiation of worker in the resque 1.26. In the master, unless the environment variable is set, fomatter is so as not to be changed, test will pass. Ref: https://github.com/resque/resque/pull/1439
* Merge pull request #25241 from aguynamedben/fix-touch-error-messagesRichard Schneeman2016-07-032-2/+12
|\ | | | | Improve error message when record touch fails.
| * Improve error message when record touch fails.Ben Standefer2016-07-022-2/+12
| | | | | | | | | | | | The current error message only indicates that a touch can fail because the record is new. In practice, we saw cases where touches were failing because the record had been destroyed. `persisted?` checks `new_record?` *and* `destroyed?`. It was confusing to get a message about a new record when in reality we were destroying records. I also included a helpful tip for users to consider using `persisted?`, `new_record?`, or `destroyed?` before touching.
* | Merge pull request #25661 from will-in-wi/clarify_postgres_docsVipul A M2016-07-021-2/+2
|\ \ | | | | | | Clarify Postgres initials. [skip ci]
| * | Clarify Postgres initials. [skip ci]William Johnston2016-07-021-2/+2
|/ /
* | Merge pull request #25658 from will-in-wi/fix_rails_5_attributes_docsVipul A M2016-07-021-3/+4
|\ \ | |/ |/| Update Rails 5 release notes with syntax fixes. [ci skip]
| * Update Rails 5 release notes with syntax fixes.William Johnston2016-07-021-3/+4
|/
* Merge pull request #25657 from htanata/fix_typoVipul A M2016-07-021-1/+1
|\ | | | | Fix typo: accidently -> accidentally. [ci skip]
| * Fix typo: accidently -> accidentally.Hendy Tanata2016-07-021-1/+1
|/
* Merge pull request #25293 from y-yagi/remove_needless_commentsMatthew Draper2016-07-033-5/+0
|\ | | | | remove needless comments
| * remove needless commentsyuuji.yaginuma2016-06-063-5/+0
| | | | | | | | Follow up to #25240.
* | Merge pull request #25647 from aditya-kapoor/correct-guide-commandVipul A M2016-07-021-3/+3
|\ \ | | | | | | Correct guide generation command [ci skip]
| * | Correct guide generation command [ci skip]Aditya Kapoor2016-07-021-3/+3
| | |
* | | Merge pull request #25638 from kamipo/remove_unused_predicate_builderSean Griffin2016-07-023-19/+3
|\ \ \ | | | | | | | | Remove unused `predicate_builder` for `BasicObjectHandler` and `RangeHandler`
| * | | Remove unused `predicate_builder` for `BasicObjectHandler` and `RangeHandler`Ryuta Kamizono2016-07-023-19/+3
| | | |
* | | | Merge pull request #25644 from Edouard-chin/forgotten-doc-removalVipul A M2016-07-021-1/+0
|\ \ \ \ | | | | | | | | | | `partial` option on the digest method is no more needed [ci skip]:
| * | | | `partial` option on the digest method is no more needed [ci skip]:Edouard CHIN2016-07-021-1/+0
| | | | | | | | | | | | | | | | | | | | - `partial` option is not used anymore, this was removed in https://github.com/rails/rails/pull/23724
* | | | | Merge pull request #25646 from y-yagi/refer_to_rails_command_instead_of_rakeVipul A M2016-07-021-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | refer to rails command instead of rake in doc of `SourceAnnotationExtractor`
| * | | | refer to rails command instead of rake in doc of `SourceAnnotationExtractor` ↵yuuji.yaginuma2016-07-021-3/+3
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #25222 from vipulnsward/25219-fix-logsMatthew Draper2016-07-023-9/+29
|\ \ \ \ \ | |_|/ / / |/| | | | Clean backtrace in IRB
| * | | | - Added test for verifying that we treat line number indications from irb as ↵Vipul A M2016-07-011-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user/lib code - Cleaned up backtrace cleaner test code and removed instaces variables
| * | | | Fixes #25219Vipul A M2016-07-012-1/+13
| | | | | | | | | | | | | | | | | | | | Add handling of cleaning up backtrace from IRB console in case of errors
* | | | | Try the newest bundlerRafael Mendonça França2016-07-021-4/+0
| |/ / / |/| | |
* | | | Merge pull request #25639 from y-yagi/followup_to_25431Rafael França2016-07-021-1/+1
|\ \ \ \ | | | | | | | | | | fix task name to remove
| * | | | fix task name to removeyuuji.yaginuma2016-07-021-1/+1
|/ / / / | | | | | | | | | | | | Follow up to #25431
* | | | Merge pull request #25507 from ↵Rafael França2016-07-023-14/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | bquorning/optimize-for-first-result-and-remove-mysql-select_one Remove #select_one from Mysql2Adapter
| * | | | Optimize ActiveRecord::Result#lastBenjamin Quorning2016-06-242-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | If you only want the last element of a result set, there's no need to create all of hash_rows. Also, add a test.
| * | | | Remove MySQL::DatabaseStatements#select_oneBenjamin Quorning2016-06-241-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation from abstract/database_statements.rb seems to work just fine. And with ActiveRecord::Result now implementing an optimized #first method, the performance concerns previously addressed in https://github.com/rails/rails/commit/bf79aa4fc14aeb2646331e767038acf0b77e9e7f should not be an issue.
| * | | | Add ActiveRecord::Result#firstBenjamin Quorning2016-06-242-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | When you only need the first element of a result set, you shouldn't need to instantiate all of hash_rows.
* | | | | Merge pull request #24177 from vipulnsward/rename-testRafael França2016-07-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Renamed NestedParametersTest to NestedParametersPermitTest
| * | | | | - Renamed NestedParametersTest to NestedParametersPermitTest, to indicate ↵Vipul A M2016-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | what we are actually testing in this file
* | | | | | Merge pull request #25631 from yahonda/revert_rename_to_ar_internal_metadataRafael França2016-07-012-28/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Revert "Rename `active_record_internal_metadatas` to `ar_internal_metadata"
| * | | | | | Revert "Rename `active_record_internal_metadatas` to `ar_internal_metadata`"Yasuo Honda2016-07-012-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 407e0ab5e5cddf6a8b6b278b12f50772d13b4d86.
* | | | | | | Merge pull request #25633 from kamipo/remove_create_table_info_cacheRafael França2016-07-011-6/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove `create_table_info_cache` because it not be reused
| * | | | | | | Remove `create_table_info_cache` because it not be reusedRyuta Kamizono2016-07-021-6/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `create_table_info_cache` is used for sharing `create_table_info` both `table_options` and `foreign_keys`. But `foreign_keys` no longer uses `create_table_info_cache` by #25307. No need caching anymore.
* | | | | / / Do not run `bundle install` when generating a new plugin.Rafael Mendonça França2016-07-016-103/+112
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since bundler 1.12.0, the gemspec is validated so the `bundle install` command will fail just after the gem is created causing confusion to the users. This change was a bug fix to correctly validate gemspecs.
* | | | | | Merge pull request #25625 from voxik/fix-rails-test-git-layoutRafael França2016-07-011-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Do not depend on Rails git repository layout in ActiveSupport tests.
| * | | | | | Do not depend on Rails git repository layout in ActiveSupport tests.Vít Ondruch2016-07-011-2/+2
| | | | | | |
* | | | | | | Merge pull request #25620 from kamipo/create_without_primary_keyRafael França2016-07-012-1/+9
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Pass `pk: false` to `connection.insert` explicitly if do not have a primary key
| * | | | | | Pass `pk: false` to `connection.insert` explicitly if do not have a primary keyRyuta Kamizono2016-07-012-1/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because causing an extra query by `sql_for_insert` for guessing a primary key. https://github.com/rails/rails/blob/v5.0.0/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb#L121-L125
* | | | | | Fix conditional order broken in ea40ec56.Kasper Timm Hansen2016-07-021-2/+2
| | | | | |
* | | | | | Merge pull request #25344 from matthewd/debug-locksMatthew Draper2016-07-024-5/+172
|\ \ \ \ \ \ | | | | | | | | | | | | | | ActionDispatch::DebugLocks
| * | | | | | Provide a middleware to debug misbehaving locksMatthew Draper2016-06-104-5/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only intended to be enabled when in use; by necessity, it sits above any reasonable access control.
* | | | | | | Merge pull request #24146 from matthewd/latch-as-proxyMatthew Draper2016-07-021-5/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Don't inherit from Concurrent::CountDownLatch
| * | | | | | | Don't inherit from Concurrent::CountDownLatchMatthew Draper2016-03-111-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That class mangles .new, which interferes with our deprecation warning. More generally, it suggests we shouldn't be subclassing without a very good reason, and avoiding one allocation doesn't seem to meet that criteria. In passing, recommend the simpler Concurrent::Event for the common count=1 case.
* | | | | | | | Merge pull request #25615 from tinco/close_hijacked_socketMatthew Draper2016-07-022-0/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | close hijacked i/o socket after use (fixes #25613)
| * | | | | | | | close hijacked i/o socket after use (fixes #25613)Tinco Andringa2016-07-012-0/+15
| | | | | | | | |
* | | | | | | | | Ensure logging on exceptions only includes what we expectMatthew Draper2016-07-021-0/+23
| | | | | | | | |
* | | | | | | | | Silence DebugExceptions template render logs during exceptionsGenadi Samokovarov2016-07-021-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an exception is raised, those Action View rendering logs are just noise for the end developer. I recently silenced those from Web Console, as we do use Action View rendering in it as well. It used created a half a screen of rendering logs. I think we can save those in this recent push for cleaner development logs. Now, the silencing is a bit hacky and we have a bunch of it now, so we can also invest in turning off the logs directly from Action View objects instead of silencing off the logging stream.
* | | | | | | | | Make mutation stand out some more.Kasper Timm Hansen2016-07-011-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Felt that += overwriting the path variable was a little too hidden. Make the outcomes easier to spot with an if-else branch.