aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15477 from aripollak/actioncontroller-overview-typoArthur Nogueira Neves2014-06-021-2/+2
|\ | | | | Fix typo in ActionController Overview
| * Fix typo in ActionController OverviewAri Pollak2014-06-021-2/+2
|/ | | | * Should say "sensitive" instead of "sensible"
* Merge pull request #15474 from unixmonkey/masterRafael Mendonça França2014-06-021-1/+1
|\ | | | | File.exist? instead of File.exists? in bin/setup
| * File.exist? instead of File.exists? in bin/setupDavid Jones2014-06-021-1/+1
| | | | | | | | | | File.exists? is deprecated in Ruby 2.1+ https://github.com/ruby/ruby/blob/v2_1_2/file.c#L1413
* | Merge pull request #15473 from sgrif/sg-missing-colonZachary Scott2014-06-021-1/+1
|\ \ | |/ |/| Add missing colon to internal [ci skip]
| * Add missing colon to internalSean Griffin2014-06-021-1/+1
|/
* just use `assert`Aaron Patterson2014-06-021-1/+1
|
* Merge pull request #15379 from xuanxu/rational_precisionRafael Mendonça França2014-06-024-5/+17
|\ | | | | Fix AS::NumberHelper results with rationals
| * Fix AS::NumberHelper results with rationalsJuanjo Bazán2014-05-314-5/+17
| | | | | | | | | | | | | | | | | | | | :precision was incorrectly being applied to Rationals before: ActiveSupport::NumberHelper.number_to_rounded Rational(10, 3), precision: 2 => "3.3" after: ActiveSupport::NumberHelper.number_to_rounded Rational(10, 3), precision: 2 => "3.33"
* | Merge pull request #15464 from tgxworld/improve_notifications_logicMatthew Draper2014-06-032-8/+18
|\ \ | | | | | | Improvements to ActiveSupport::Notifications.
| * | Avoid looping through subscribers when unsubscribing with a subscriber object.Guo Xiang Tan2014-06-011-5/+10
| | |
| * | Update documentation to reflect unsubscription with name.Guo Xiang Tan2014-06-012-4/+9
| | |
* | | docs, fix typo [ci skip]Yves Senn2014-06-021-2/+2
| | |
* | | test pg, add basic test cases for point datatype.Yves Senn2014-06-021-0/+45
| | |
* | | pg, inline casting methods into `OID::Type` objects.Yves Senn2014-06-024-44/+25
| | | | | | | | | | | | | | | | | | | | | | | | This inlines casting for the most obvious types. The rest will follow eventually. I need to put some tests in place, to make sure that the inlining is not causing regressions. /cc @sgrif
* | | Feature requests should be made on the mailing list, not submitted toZachary Scott2014-06-017-7/+40
| | | | | | | | | | | | the issue tracker. See also #15455 [ci skip]
* | | Merge pull request #15444 from sgrif/sg-yaml-new-recordGuillermo Iguaran2014-06-014-2/+28
|\ \ \ | | | | | | | | New records should remain new after yaml serialization
| * | | New records should remain new after yaml serializationSean Griffin2014-06-014-2/+28
|/ / /
* | | :nail_care: for migrations guide from #15457 [ci skip]Zachary Scott2014-06-011-7/+8
| | |
* | | Merge pull request #15457 from maurogeorge/add-changing-columnsZachary Scott2014-06-011-0/+22
|\ \ \ | | | | | | | | Create Changing Columns on migrations guides [ci skip]
| * | | Create Changing Columns on migrations guidesMauro George2014-06-011-0/+22
| | | | | | | | | | | | | | | | [ci skip]
* | | | Remove docs regarding grouping multiple values, as we should avoidZachary Scott2014-06-011-18/+1
| | | | | | | | | | | | | | | | duplicating API reference in guides. Also :scissors: [ci skip]
* | | | Merge pull request #15459 from maurogeorge/add-total-grouped-itemsZachary Scott2014-06-011-0/+34
|\ \ \ \ | |_|/ / |/| | | Add Total of grouped items to Active Record query interface on guides [ci skip]
| * | | Add Total of grouped items to AR query interface on guidesMauro George2014-06-011-0/+34
| |/ / | | | | | | | | | [ci skip]
* | | Merge pull request #15435 from sgrif/sg-rm-serializationYves Senn2014-06-0112-103/+30
|\ \ \ | | | | | | | | Remove most code related to serialized properties
| * | | Remove most code related to serialized propertiesSean Griffin2014-06-0112-103/+30
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nearly completely implemented in terms of custom properties. `_before_type_cast` now stores the raw serialized string consistently, which removes the need to keep track of "state". The following is now consistently true: - `model.serialized == model.reload.serialized` - A model can be dumped and loaded infinitely without changing - A model can be saved and reloaded infinitely without changing
* | | Merge pull request #15432 from sgrif/sg-coder-type-castingYves Senn2014-06-014-23/+14
|\ \ \ | | | | | | | | Don't change values in `@raw_attributes` during serialization
| * | | Don't change values in `@raw_attributes` during serializationSean Griffin2014-06-014-23/+14
| | | | | | | | | | | | | | | | | | | | | | | | During `init_with`, the attributes given to the coder will be placed into `@raw_attributes`. As such, we should read from `@raw_attributes` when encoding, rather than `@attributes`, which has been type cast.
* | | | Merge pull request #14881 from robin850/patch-19Yves Senn2014-06-011-5/+8
|\ \ \ \ | | | | | | | | | | Swallow bundler exceptions when running tests
| * | | | Swallow bundler exceptions when running testsRobin Dupret2014-04-271-5/+8
| | | | | | | | | | | | | | | | | | | | Let's avoid useless output when testing stuff related to Bundler.
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-06-014-6/+11
|\ \ \ \ \
| * | | | | document generators hidden_namespacesschneems2014-05-291-0/+5
| | | | | |
| * | | | | [ci skip] add created_at and updated_at to exampleschneems2014-05-291-2/+2
| | | | | |
| * | | | | [ci skip] Fix Compiler's Github linkHarshad Sabne2014-05-271-1/+1
| | | | | |
| * | | | | :scissors:Zachary Scott2014-05-121-3/+3
| | | | | |
* | | | | | Merge pull request #15456 from jonatack/patch-7Matthew Draper2014-06-011-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | config.assets.digests -> config.assets.digest
| * | | | | config.assets.digests -> config.assets.digestJon Atack2014-06-011-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | in Asset Pipeline guide. [skip ci]
* | | | | Removed 'Caching with Rails' guide from WIP, this guide isn't ready toZachary Scott2014-05-311-5/+0
| | | | | | | | | | | | | | | | | | | | be published and requires more attention. [ci skip]
* | | | | Merge pull request #15449 from aditya-kapoor/correct-debug-docRichard Schneeman2014-05-311-5/+1
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] correct doc for ActionView::Helpers::DebugHelper
| * | | | | [ci skip] correct doc for ActionView::Helpers::DebugHelperAditya Kapoor2014-05-311-5/+1
| | |_|_|/ | |/| | |
* | | | | Missing period from AP/CHANGELOG [ci skip]Zachary Scott2014-05-311-1/+1
| | | | |
* | | | | Merge pull request #15448 from akshay-vishnoi/doc_changesCarlos Antonio da Silva2014-05-311-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | [ci skip] Correct output of Hash#symbolize_keys
| * | | | [ci skip] Correct output of Hash#symbolize_keysAkshay Vishnoi2014-05-311-2/+2
| | | | |
* | | | | Merge pull request #15434 from sgrif/sg-clear-cachesYves Senn2014-05-312-3/+27
|\ \ \ \ \ | |/ / / / |/| | | | Clear all caches calculated based on `@columns` when `@columns` changes
| * | | | Clear all caches calculated based on `@columns` when `@columns` changesSean Griffin2014-05-312-3/+27
| | | | |
* | | | | Tiny formatting fix in AS change log [ci skip]Robin Dupret2014-05-311-4/+4
| | | | |
* | | | | Merge pull request #15446 from akshay-vishnoi/doc_changesRobin Dupret2014-05-311-2/+2
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Correct documentation of HashWithIndifferentAccess#dup
| * | | | | [ci skip] Correct documentation of HashWithIndifferentAccess#dupAkshay Vishnoi2014-05-311-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge pull request #15445 from krautcomputing/fix_asset_host_docsZachary Scott2014-05-311-1/+4
|\ \ \ \ \ | |/ / / / |/| | | | Update documentation for setting asset_host to a Proc [ci skip]
| * | | | Update documentation for setting asset_host to a Proc, mention that the ↵Manuel Meurer2014-05-311-1/+4
|/ / / / | | | | | | | | | | | | request parameter might not be supplied [ci skip]