aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make `AR::SpawnMethods#merge!` to check an arg is a Procyui-knk2015-11-122-3/+9
| | | | | | | | | | From Ruby ( 2.3.0dev trunk 52520), `Hash#to_proc` is defined (https://github.com/ruby/ruby/commit/fbe967ec02cb65a7efa3fb8f3d747cf6f620dde1), and many tests have been failed with `ArgumentError: wrong number of arguments (given 0, expected 1)`. Because we call `Hash#to_proc` with no args in `#merge!`. This commit changes order of conditionals to not call `Hash#to_proc`.
* Merge pull request #22216 from grosser/grosser/fast-retRafael França2015-11-101-9/+12
|\ | | | | fast and consistent return when local_cache does not exist
| * fast and consistent return when local_cache does not existMichael Grosser2015-11-071-9/+12
| |
* | Merge pull request #22244 from pacso/time-days-in-yearAndrew White2015-11-103-0/+30
|\ \ | | | | | | Add days_in_year method to Time class
| * | Add days_in_year methodJon Pascoe2015-11-103-0/+30
| | |
* | | Merge pull request #22190 from 1st8/fix/week-field-week-numberAndrew White2015-11-103-5/+16
|\ \ \ | | | | | | | | | | | | Fix week_field returning invalid value
| * | | Fix week_field returning invalid valueChristoph2015-11-103-5/+16
|/ / / | | | | | | | | | | | | | | | | | | According to the W3 spec[1] the value should use a 1-based index and not a 0-based index for the week number. [1]: http://www.w3.org/TR/html-markup/datatypes.html#form.data.week
* | | Merge pull request #22237 from yukas/patch-1Kasper Timm Hansen2015-11-091-1/+1
|\ \ \ | |/ / |/| | Minor fix in Module#mattr_reader documentation
| * | Minor fix in Module#mattr_reader documentationYuri Kasperovich2015-11-091-1/+1
|/ /
* | Merge pull request #22155 from jcoleman/patch-1Eileen M. Uchitelle2015-11-091-0/+2
|\ \ | | | | | | Clarify i18n active[model/record] key differences
| * | Clarify i18n active[model/record] key differencesJames Coleman2015-11-081-0/+2
| | | | | | | | | | | | I spent a decent amount of time the other day trying to figure out why my active model including class wasn't generating the properly localized validation messages, and a note like this would have saved me a lot of time.
* | | Merge pull request #22230 from y-yagi/fix_method_name_typoRichard Schneeman2015-11-091-1/+1
|\ \ \ | | | | | | | | fix method name typo [ci skip]
| * | | fix method name typo [ci skip]yuuji.yaginuma2015-11-091-1/+1
|/ / /
* | | Merge pull request #22226 from boone/docsSean Griffin2015-11-083-3/+3
|\ \ \ | | | | | | | | ActiveJob docs text fix. [ci skip]
| * | | Fixed wording.Mike Boone2015-11-083-3/+3
| | | |
* | | | Merge pull request #22225 from arnvald/allow_host_in_js_css_helpersSantiago Pastorino2015-11-083-2/+8
|\ \ \ \ | | | | | | | | | | Allow `host` option in javscript and css helpers
| * | | | Allow `host` option in javscript and css helpersGrzegorz Witek2015-11-083-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Now both `javascript_include_tag` and `stylesheet_tag` can accept `host` option to provide custom host for the asset
* | | | | Merge pull request #22206 from grosser/grosser/drySantiago Pastorino2015-11-081-20/+15
|\ \ \ \ \ | |_|/ / / |/| | | | dry up increment/decrement
| * | | | dry up increment/decrementMichael Grosser2015-11-071-20/+15
| | | | |
* | | | | Merge pull request #22222 from ↵Godfrey Chan2015-11-082-1/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/fix_application_controller_require_dependency_path_in_api fix application_controller require_dependency path generated by api scaffold generator
| * | | | | 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
* | | | | Merge pull request #22224 from kassio/masterRafael França2015-11-083-2/+28
|\ \ \ \ \ | |/ / / / |/| | | | Improve support for non Active Record objects on `validates_associated`
| * | | | Improve support for non Active Record objects on `validates_associated`Kassio Borges2015-11-083-2/+28
|/ / / / | | | | | | | | | | | | | | | | | | | | Skipping `marked_for_destruction?` when the associated object does not responds to it make easier to validate virtual associations built on top of Active Model objects and/or serialized objects that implement a `valid?` instance method.
* | | | Merge pull request #22218 from EhsanYousefi/patch-2Richard Schneeman2015-11-071-2/+1
|\ \ \ \ | | | | | | | | | | Fix Unnecessary variable assignment /associations/builder/belongs_to.rb#add_destroy_callbacks
| * | | | Update belongs_to.rbEhsan Yousefi2015-11-081-2/+1
|/ / / / | | | | | | | | There is no need to to assign reflection name to a variable, because it's called once.
* | | | Merge pull request #21897 from swaathi/masterKasper Timm Hansen2015-11-077-14/+156
|\ \ \ \ | | | | | | | | | | Parameterize with options to preserve the case of string
| * | | | Parameterize with options to preserve case of stringSwaathi K2015-11-077-14/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added test cases Using kwargs instead of three seperate functions Updated parameterize in transliterate.rb Updated parameterize in transliterate.rb Added deprecation warnings and updating RDoc+Guide Misspelled separtor. Fixed. Deprecated test cases and added support to parameterize with keyword parameters Squashing commits. Fixed test cases and added deprecated test cases Small changes to Gemfile.lock and CHANGELOG Update Gemfile.lock
* | | | | docs, get rid of artifact in `RecordFetchWarning` docs.Yves Senn2015-11-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] There was a `ActiveRecord::Relation::RecordFetchWarning::ActiveSupport` artifact caused by subscribing to AS notifications.
* | | | | docs, nodoc `EnumType`. [ci skip]Yves Senn2015-11-071-1/+1
| |_|_|/ |/| | | | | | | | | | | | | | | This type is backed by a class macro. Documentation related to the type casting behavior should be added in the macro description.
* | | | docs, `ActiveRecord::JoinDependency` is not part of the public API.Yves Senn2015-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] While `JoinDependency` and `JoinDependency::Aliases` were nodoced, the inner `Table` class made them appear in the API.
* | | | docs, `ActiveRecord::TypeCaster` is not part of the public API.Yves Senn2015-11-073-3/+3
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #22197 from grosser/grosser/fetchKasper Timm Hansen2015-11-072-11/+14
|\ \ \ \ | |_|/ / |/| | | do not override fetch on local cache
| * | | do not override fetch on local cacheMichael Grosser2015-11-072-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | fetch is supposed to behave differently, this was a mistake merged in https://github.com/rails/rails/pull/22194
* | | | Merge pull request #21806 from kachick/fix-transformer-sizeEileen M. Uchitelle2015-11-074-8/+12
|\ \ \ \ | | | | | | | | | | Return a sized Enumerator from Hash#transform_values{!}
| * | | | Return a sized Enumerator from Hash#{transform_values{!}|transform_keys{!}}Kenichi Kamiya2015-09-294-8/+12
| | | | |
* | | | | Fix test failuresSean Griffin2015-11-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The previous commit changes the state of the class, and while we are cleaning up the database, I forgot to clean up the class
* | | | | Ensure `#reset_column_information` clears child classes as wellSean Griffin2015-11-073-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've added a redundant test for this under the attributes API as well, as that also causes this bug to manifest through public API (and demonstrates that calling `reset_column_information` on the child classes would be insufficient) Since children of a class should always share a table with their parent, just reloading the schema from the cache should be sufficient here. `reload_schema_from_cache` should probably become public and `# :nodoc:`, but I'd rather avoid the git churn here. Fixes #22057
* | | | | Merge pull request #22213 from y-yagi/remove_deprecated_option_from_guideRichard Schneeman2015-11-071-15/+0
|\ \ \ \ \ | | | | | | | | | | | | remove deprecated `:tokenizer` option from guide [ci skip]
| * | | | | remove deprecated `:tokenizer` option from guide [ci skip]yuuji.yaginuma2015-11-071-15/+0
| | |_|/ / | |/| | | | | | | | | | | | | `:tokenizer` option was deprecated in 1c341eb7cbaeb52435f14c2595e391bfb2e5e38b
* | | | | Merge pull request #22145 from atul-shimpi/masterYves Senn2015-11-071-2/+0
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | guides, the required option in generators is no longer available. [ci skip]
| * | | | Issue #22139 : Edge Guides - ActiveRecord Migrations - Remove required ↵atul-shimpi2015-11-011-2/+0
| | | | | | | | | | | | | | | | | | | | option for column
* | | | | Merge pull request #22211 from atul-shimpi/masterKasper Timm Hansen2015-11-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Add comma to to make the information clear
| * | | | | Add comma to to make the information clearUbuntu2015-11-071-1/+1
| | | | | |
* | | | | | Fix wrong `assert_equal` argument order.Kasper Timm Hansen2015-11-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It goes expected, then actual. Only changed this because the file was just touched (please don't submit pull requests :)).
* | | | | | Merge pull request #22207 from yui-knk/suppress_warningsKasper Timm Hansen2015-11-071-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Suppress warning (warning about assigned but unused variable)
| * | | | | Suppress warning (warning about assigned but unused variable)yui-knk2015-11-071-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | These warings have been appeared from https://github.com/rails/rails/commit/92bc8cdb0771bf6ffcfb31ef58dba529527b514c
* | | | | Merge pull request #21967 from kevinbuch/connection-middleware-mutationRichard Schneeman2015-11-063-4/+15
|\ \ \ \ \ | | | | | | | | | | | | Avoid mutating original response in connection management middleware
| * | | | | Avoids mutating the original response in connection management middlewareKevin Buchanan2015-11-063-4/+15
|/ / / / /
* | | | | Merge pull request #22203 from cllns/guides-has-many-through-join-modelsEileen M. Uchitelle2015-11-061-2/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | Clarify automatic creation/deletion of join models for has_many through
| * | | | Clarify automatic creation/deletion of join models for has_many throughSean Collins2015-11-061-2/+4
| | | | | | | | | | | | | | | | | | | | [ci-skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 08:03:20 +0000