aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15621 from sgrif/sg-column-type-decorationsRafael Mendonça França2014-06-102-2/+1
|\ | | | | No need to decorate columns twice
| * No need to decorate columns twiceSean Griffin2014-06-102-2/+1
| | | | | | | | | | | | | | We never want result types to override column types, and `decorate_columns` can only affect column types. No need to go through the decoration multiple times, we can just exclude the column types from the result types instead.
* | Merge pull request #15619 from aditya-kapoor/fix-js-docRafael Mendonça França2014-06-101-1/+7
|\ \ | | | | | | [ci skip] Fix doc for javascript_helper
| * | [ci skip] Fix doc for javascript_helperAditya Kapoor2014-06-111-1/+7
| | |
* | | Merge pull request #15620 from aditya-kapoor/correct-bundler-linkZachary Scott2014-06-101-4/+3
|\ \ \ | |/ / |/| | Correct Bundler link [ci skip]
| * | Correct Bundler link [ci skip]Aditya Kapoor2014-06-111-4/+3
|/ /
* | Merge pull request #15618 from JuanitoFatas/doc/action-mailer-guideRafael Mendonça França2014-06-101-10/+19
|\ \ | | | | | | [ci skip] Refine Action Mailer guide.
| * | [ci skip] Refine Action Mailer guide.Juanito Fatas2014-06-111-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Wrap 80 words if possible. * Make attachment hash options more readable. (L239-L243) Before: ![screenshot 2014-06-11 02 59 54](https://cloud.githubusercontent.com/assets/1000669/3235432/a91d0464-f0d2-11e3-9e4a-6af2b2a83f1a.png) After: ![screenshot 2014-06-11 02 59 36](https://cloud.githubusercontent.com/assets/1000669/3235428/a47b28dc-f0d2-11e3-806c-cfaedd3f15df.png) * L619 Wrap "location" in code: `"location"`. * L628 Use actual section name. * L697 Remove unnecessary `./` when refer to other guide.
* | | Merge pull request #15617 from kuldeepaggarwal/remove-deprecate-methodRafael Mendonça França2014-06-102-13/+1
|\ \ \ | | | | | | | | remove deprecation call while initializing `ClassCache` object
| * | | remove deprecation call while initializing `ClassCache` objectKuldeep Aggarwal2014-06-112-13/+1
|/ / /
* | | Merge pull request #15616 from apanzerj/fix_long_key_pathsRafael Mendonça França2014-06-103-0/+13
|\ \ \ | | | | | | | | fix error with long keys in ActiveSupport::Cache::FileStore
| * | | fix error with long keys in ActiveSupport::Cache::FileStoreAdam Panzer2014-06-103-0/+13
| |/ /
* | | Merge pull request #15615 from JuanitoFatas/doc/action-mailerRafael Mendonça França2014-06-101-2/+2
|\ \ \ | | | | | | | | [ci skip] Improve enable_starttls_auto documentation (Action Mailer).
| * | | [ci skip] Improve enable_starttls_auto documentation.Juanito Fatas2014-06-111-2/+2
| |/ /
* | | Merge pull request #15614 from akshay-vishnoi/doc_changesRichard Schneeman2014-06-102-18/+15
|\ \ \ | | | | | | | | [ci skip] Add Docs for strip_insignificant_zeros option in number_to_human
| * | | [ci skip] Add Docs for strip_insignificant_zeros option in number helpersAkshay Vishnoi2014-06-102-18/+15
| |/ /
* | | Merge pull request #15612 from akshay-vishnoi/delete-deprecated-methodRafael Mendonça França2014-06-103-10/+4
|\ \ \ | |/ / |/| | Remove deprecated method ActiveRecord::Base.quoted_locking_column
| * | Remove deprecated method ActiveRecord::Base.quoted_locking_columnAkshay Vishnoi2014-06-103-10/+4
| |/
* | Merge pull request #15611 from akshay-vishnoi/doc_changesArthur Nogueira Neves2014-06-102-4/+4
|\ \ | |/ |/| [ci skip] Correct output and use valid options of number helpers
| * [ci skip] Correct output and use valid options of number helpersAkshay Vishnoi2014-06-102-4/+4
|/
* Merge pull request #15610 from sgrif/silence-warningsRafael Mendonça França2014-06-102-3/+3
|\ | | | | Fix warnings in tests
| * Silence warnings in tests.Sean Griffin2014-06-102-3/+3
| | | | | | | | | | | | | | | | ``` activerecord/test/cases/adapters/postgresql/range_test.rb:159: warning: (...) interpreted as grouped expression activerecord/test/cases/finder_test.rb:38: warning: shadowing outer local variable - e activerecord/test/cases/finder_test.rb:43: warning: shadowing outer local variable - e ```
* | Merge pull request #15609 from sgrif/sg-yaml-virtual-columnsRafael Mendonça França2014-06-104-3/+32
|\ \ | | | | | | Keep the types of virtual columns after yaml serialization
| * | Keep the types of virtual columns after yaml serializationSean Griffin2014-06-104-3/+32
| |/ | | | | | | | | On MySQL and PostgreSQL, the adapter does not type cast virtual columns for us.
* | Merge pull request #15603 from kuldeepaggarwal/remove-deprecation-methodRafael Mendonça França2014-06-102-37/+0
|\ \ | | | | | | remove depricated Validatior#setup
| * | remove depricated Validatior#setupKuldeep Aggarwal2014-06-102-37/+0
| | |
* | | Merge pull request #15605 from mekishizufu/fix_cache_digests_rake_tasksRafael Mendonça França2014-06-102-6/+14
|\ \ \ | |_|/ |/| | Fix cache_digest rake tasks
| * | Fix cache_digest rake tasksJiri Pospisil2014-06-102-6/+14
| | | | | | | | | | | | | | | Bring cache_digests:* rake tasks up-to-date with the API changes introduced in 637bb726cac60aaa1f7e482836458aa73e17fbb7
* | | Merge pull request #15607 from sgrif/sg-array-type-castRafael Mendonça França2014-06-103-34/+28
|\ \ \ | |/ / |/| | Inline PG array type casting helper
| * | Inline PG array type casting helperSean Griffin2014-06-103-34/+28
| | |
* | | test, fix typo, `create_index` does not exist.Yves Senn2014-06-101-1/+1
| | |
* | | docs, refactor docs about column modifiers. [ci skip] [Matthew Draper & Yves ↵Yves Senn2014-06-101-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Senn] This is a follow up to #15602 which rendered the guides in a weird state: > You can also specify some options just after the field type between curly braces. You can use the following modifiers: > `null` Allows or disallows `NULL` values in the column. > NOTE: `null` and `default` cannot be specified via command line. The modifiers are now moved into a separate section. The generator simply referes to that section. Related to #15583. /cc @JuanitoFatas
* | | Merge pull request #15604 from JuanitoFatas/doc/migrationXavier Noria2014-06-102-2/+2
|\ \ \ | | | | | | | | [ci skip] Rename: Rails Database Migration to Active Record Migration.
| * | | [ci skip] Rename: Rails Database Migration to Active Record Migration.Juanito Fatas2014-06-102-2/+2
|/ / / | | | | | | | | | This will need to setup permanent redirect for the old guide.
* | | Merge pull request #15584 from jamesyang124/issue_15382Yves Senn2014-06-103-1/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord::FinderMethods.find doesn't pass proc parameter to array Manual merge of #15584. Closes #15584.
| * | | ActiveRecord::FinderMethods.find passes proc parameter #15382James Yang2014-06-103-1/+19
|/ / /
* | | Merge pull request #15602 from JuanitoFatas/doc/type-modifierYves Senn2014-06-101-0/+2
|\ \ \ | | | | | | | | [ci skip] Add note about type modifiers that cannot be specified in command line.
| * | | [ci skip] Add note about type modifiers that cannot be specified in command ↵Juanito Fatas2014-06-101-0/+2
|/ / / | | | | | | | | | line.
* | | Merge pull request #15599 from arthurnn/HABTMAssociationRafael Mendonça França2014-06-102-2/+2
|\ \ \ | | | | | | | | Use HasAndBelongsToMany instead of HABTM
| * | | Use HasAndBelongsToMany instead of HABTMArthur Neves2014-06-092-2/+2
|/ / /
* | | Merge pull request #15597 from eileencodes/reuse-available-collection-methodsRafael Mendonça França2014-06-093-5/+5
|\ \ \ | | | | | | | | reuse available collection? check instead of macro
| * | | reuse available collection? check instead of macroeileencodes2014-06-093-5/+5
|/ / / | | | | | | | | | | | | | | | | | | Reflection has an available method that is used to check if the reflection is a collection. Any :has_many macro is considered a collection and `collection?` should be used instead of `macro == :has_many`.
* | | Merge pull request #15596 from eileencodes/add-has_one-method-and-reuseRafael Mendonça França2014-06-095-5/+9
|\ \ \ | | | | | | | | add has_one? method and reuse instead of checking macro
| * | | add has_one? method and reuse instead of checking macroeileencodes2014-06-095-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | Instead of checking for `macro == :has_one` throughout the codebase we can create a `has_one?` method to match the `belongs_to?`, `polymorphic?` and other methods.
* | | | Merge pull request #15595 from eileencodes/abstract-away-habtm-macroAaron Patterson2014-06-092-2/+9
|\ \ \ \ | |/ / / |/| | | Abstract away use of HABTM macro
| * | | Abstract away use of HABTM macroeileencodes2014-06-092-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By having the `:has_and_belongs_to_many` macro in the `@collection` we are punishing `:has_many` associations because it has to allocate the array and check the macro. @collection is returned to `macro == :has_many` and a new reflection class `HABTMReflection` is created to handle this case instead.
* | | | Fix bug that make HashWithIndifferentAccess work differently of HashRafael Mendonça França2014-06-092-1/+9
| | | | | | | | | | | | | | | | | | | | Before HashWithIndifferentAccess were doing deep_dup of the inner hashes when Hash doesn't do. Now both are behaving in the same way.
* | | | Timestamp values should be present on callbacksRafael Mendonça França2014-06-094-23/+15
| |/ / |/| | | | | | | | | | | | | | | | | This reverts commit dd3ea17191e316aeebddaa7b176f6cfeee7a6365 and add a regression test. Fixes #15418
* | | Merge pull request #15592 from sgrif/sg-type-cast-from-databaseRafael Mendonça França2014-06-0926-132/+135
|\ \ \ | |_|/ |/| | Rename `type_cast` to `type_cast_from_database`
| * | Rename `type_cast` to `type_cast_from_database`Sean Griffin2014-06-0926-132/+135
|/ / | | | | | | | | | | | | | | In some cases there is a difference between the two, we should always be doing one or the other. For convenience, `type_cast` is still a private method on type, so new types that do not need different behavior don't need to implement two methods, but it has been moved to private so it cannot be used accidentally.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 12:30:02 +0000