aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Revert "bundle u mocha"Akira Matsuda2017-01-162-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 66e5b9d3f47cd52143be0e6a216ade34bb52b9cc. We're seeing some test failures in AR postgresql tests
* | | | | | | bundle u mochaAkira Matsuda2017-01-152-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I see no reason not to use the newest stable version.
* | | | | | | Allow render locals to be assigned to instance variablesAndrew White2017-01-154-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In #26672 we blocked use of Ruby keywords as identifiers for view locals but inadvertently broke the use of instance variable names as identifiers. Whilst not explicitly documented this behavior has been around for a long time and there's no need to break it now. Fixes #27480.
* | | | | | | Merge pull request #27684 from y-yagi/remove_ununnecessary_addition_of_libKasper Timm Hansen2017-01-151-1/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | remove unnecessary addition of `lib`
| * | | | | | remove unnecessary addition of `lib`yuuji.yaginuma2017-01-151-1/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | `TestTask` add `lib` directory by default. Ref: https://github.com/ruby/rake/blob/master/lib/rake/testtask.rb#L39..L41
* | | | | | Merge pull request #27687 from ↵Ryuta Kamizono2017-01-151-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | kenta-s/fix-broken-example-code-in-output_safety_helper Fix broken sample code in action_view/helpers/output_safety_helper.rb…
| * | | | | Fix broken sample code in action_view/helpers/output_safety_helper.rb [ci skip]kenta-s2017-01-151-1/+1
|/ / / / /
* | | | | ZOMG worst typo in my life :scream:Akira Matsuda2017-01-151-1/+1
| | | | |
* | | | | It would be safer not to totally undef core classes' respond_to_missing?Akira Matsuda2017-01-152-2/+12
| | | | | | | | | | | | | | | | | | | | instead, rewrite them to no-op
* | | | | `respond_to_missing?` should fallback to `super` where method_missing could ↵Akira Matsuda2017-01-152-2/+2
| | | | | | | | | | | | | | | | | | | | call `super`
* | | | | AS::StringInquirer#respond_to_missing? should fallback to superAkira Matsuda2017-01-153-3/+19
| | | | | | | | | | | | | | | | | | | | in case String or any other ancestor class' respond_to_missing? was defined.
* | | | | This test wasn't actually an effective regression testAkira Matsuda2017-01-151-4/+5
| | | | |
* | | | | Merge pull request #27660 from akihiro17/updates-timestampKasper Timm Hansen2017-01-144-7/+32
|\ \ \ \ \ | | | | | | | | | | | | Add the touch option to ActiveRecord#increment! and decrement!
| * | | | | Add the touch option to ActiveRecord#increment! and decrement!akihiro172017-01-144-7/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Supports the `touch` option from update_counters. The default behavior is not to update timestamp columns.
* | | | | | Unused &block parameterAkira Matsuda2017-01-151-1/+1
| | | | | |
* | | | | | AS::ArrayInquirer#respond_to_missing? should fallback to superAkira Matsuda2017-01-153-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | in case Array or any other ancestor class' respond_to_missing? was defined.
* | | | | | Merge pull request #27680 from kamipo/fix_scope_for_createKasper Timm Hansen2017-01-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | `type_condition` should be overwritten by `create_with_value` in `scope_for_create`
| * | | | | | `type_condition` should be overwritten by `create_with_value` in ↵Ryuta Kamizono2017-01-151-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `scope_for_create` `type_condition` should be overwritten by `create_with_value`. So `type` in `create_with_value` should be a string because `where_values_hash` keys are converted to string. Fixes #27600.
* | | | | | Merge pull request #27679 from lcpriest/patch-1Arthur Nogueira Neves2017-01-131-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Small spelling error
| * | | | | | Small spelling errorLachlan Priest2017-01-141-4/+4
|/ / / / / / | | | | | | | | | | | | existing_acrnoyms -> existing_acronyms
* | | | | | Fix pool_from_any_process to use most recent speceileencodes2017-01-132-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a process is forked more than once, the pool was grabbing the oldest spec, not the most recent spec. This wasn't noticed before because most folks are lilely forking the process only once. If you're forking the process multiple times however the wrong spec name will be returned and an incorrect connection will be used for the process. This fixes the issue by reversing the list of spec names so we can grab the most recent spec rather than the oldest spec.
* | | | | | Merge pull request #27667 from koic/ci_against_jruby_9_1_7_0Eileen M. Uchitelle2017-01-131-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | CI against JRuby 9.1.7.0
| * | | | | | CI against JRuby 9.1.7.0Koichi ITO2017-01-131-3/+3
| | | | | | |
* | | | | | | Merge pull request #27677 from j3ck/masterEileen M. Uchitelle2017-01-131-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix missing bracket.
| * | | | | | | Fix missing bracket.Eugene2017-01-141-1/+1
|/ / / / / / / | | | | | | | | | | | | | | Fix missing left bracket in exception message.
* | | | | | | Merge pull request #27675 from kirs/update-builderMatthew Draper2017-01-141-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Update builder gem to avoid deprecations of 2.4
| * | | | | | Update builder gem to avoid deprecations of 2.4Kir Shatrov2017-01-131-1/+1
|/ / / / / /
* | | | | | Merge pull request #27668 from kenta-s/fix-grammar-in-asset_url_helperRyuta Kamizono2017-01-131-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix grammar in asset_url_helper.rb [ci skip]
| * | | | | | Fix grammar in asset_url_helper.rb [ci skip]kenta-s2017-01-131-3/+3
|/ / / / / /
* / / / / / Constant look-up would no longer fall back to top-level constant since ruby 2.5Akira Matsuda2017-01-131-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | See: https://github.com/ruby/ruby/commit/44a2576f798b07139adde2d279e48fdbe71a0148 https://github.com/ruby/ruby/commit/9df88e9cae57aa421230f14500e88f33f127414f
* | | | | Rails::Generators::AppBase::GemfileEntry needs anonymous superclassAkira Matsuda2017-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it has some methods that override the accessors and calls the original accessors via `super` this partially reverts 9360b6be63b7a452535699bcf6ae853df7f5eea7
* | | | | AC::ParamsWrapper::Options needs anonymous superclassAkira Matsuda2017-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it has some methods that override the accessors and calls the original accessors via `super` this partially reverts 9360b6be63b7a452535699bcf6ae853df7f5eea7
* | | | | class Foo < Struct.new(:x) creates an extra unneeded anonymous classAkira Matsuda2017-01-1321-39/+33
| | | | | | | | | | | | | | | | | | | | because Struct.new returns a Class, we just can give it a name and use it directly without inheriting from it
* | | | | Merge pull request #27664 from kenta-s/fix-typo-in-asset-tag-helperप्रथमेश Sonpatki2017-01-131-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Fix typo extention -> extension [ci skip]
| * | | | Fix typo extention -> extension [ci skip]kenta-s2017-01-131-1/+1
|/ / / /
* | | | Merge pull request #27656 from y-yagi/fix_method_name_in_renderer_docप्रथमेश Sonpatki2017-01-121-1/+2
|\ \ \ \ | | | | | | | | | | fix method name in `Renderer` doc [ci skip]
| * | | | fix method name in `Renderer` doc [ci skip]yuuji.yaginuma2017-01-121-1/+2
|/ / / / | | | | | | | | | | | | `ActionController::Renderer.defaults` was removed in 2db7304
* | | | Add duration constructors for use in Numeric extensionsAndrew White2017-01-124-35/+77
| | | | | | | | | | | | | | | | | | | | The Numeric extensions like 1.day, 1.month, etc. shouldn't know how the internals of ActiveSupport::Duration works.
* | | | Add additional tests for #27610Andrew White2017-01-121-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 1.month no longer equals 30.days add some tests to ensure that addition maintains the same day in the month or is the last day in the month if the month has less days than the current day. Also add a test for the behaviour of 12.months == 1.year.
* | | | Reduce string objects by using \ instead of + or << for concatenating stringsAkira Matsuda2017-01-1231-567/+567
| | | | | | | | | | | | | | | | (I personally prefer writing one string in one line no matter how long it is, though)
* | | | beginrescueendAkira Matsuda2017-01-121-5/+3
| | | |
* | | | Merge pull request #27610 from Envek/fix_and_speed_up_duration_parsingAndrew White2017-01-128-22/+59
|\ \ \ \ | | | | | | | | | | Fix inconsistent parsing of Durations with both months and years
| * | | | Fix inconsistent results when parsing large durations and constructing ↵Andrey Novikov2017-01-098-22/+59
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | durations from code ActiveSupport::Duration.parse('P3Y') == 3.years # It should be true Duration parsing made independent from any moment of time: Fixed length in seconds is assigned to each duration part during parsing. Changed duration of months and years in seconds to more accurate and logical: 1. The value of 365.2425 days in Gregorian year is more accurate as it accounts for every 400th non-leap year. 2. Month's length is bound to year's duration, which makes sensible comparisons like `12.months == 1.year` to be `true` and nonsensical ones like `30.days == 1.month` to be `false`. Calculations on times and dates with durations shouldn't be affected as duration's numeric value isn't used in calculations, only parts are used. Methods on `Numeric` like `2.days` now use these predefined durations to avoid duplicating of duration constants through the codebase and eliminate creation of intermediate durations.
* | | | Merge pull request #27652 from y-yagi/remove_unused_requireRafael França2017-01-113-6/+0
|\ \ \ \ | |_|_|/ |/| | | remove unused requires
| * | | remove unused requiresyuuji.yaginuma2017-01-123-6/+0
| | | | | | | | | | | | | | | | Related to 0129ca2eeb6d5b2ea8c6e6be38eeb770fe45f1fa, f7782812f7e727178e4a743aa2874c078b722eef, f9ed83321ac1d1902578a0aacdfe55d3db754219
* | | | Revert "Merge pull request #27586 from maclover7/jm-fix-27584"Rafael Mendonça França2017-01-112-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5eff7a9ca7bb2ee7f16db1ab4d11cebe28757ba5, reversing changes made to 5f03172f54a58a57a48a3121562beb2cef866cbe. Reason: It caused a regression. The test case is on the PR.
* | | | Merge pull request #27646 from palkan/chore/upd-gitignoreRafael França2017-01-111-0/+1
|\ \ \ \ | | | | | | | | | | Add .byebug_history to .gitignore
| * | | | [ci skip] Add .byebug_history to .gitignorepalkan2017-01-111-0/+1
| | | | |
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2017-01-117-17/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: railties/lib/rails/generators.rb
| * | | | | `meta-data` --> `metadata`Jon Moss2016-12-311-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes space from the word; is now spelled in the standard way. [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 13:03:12 +0000