aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #20124 from greysteil/fix-select-helperRafael Mendonça França2015-06-083-3/+21
|\ | | | | Raise an ArgumentError when `include_blank` is false for a required select field
| * Raise an ArgumentError when `include_blank` is false for a required field inGrey Baker2015-06-083-3/+21
|/ | | | | | | | | | `Tags::Base#select_content_tag`. Previously, passing a falsey value to `include_blank` would be ignored if the field was required, and a blank line would still be inserted. The following will now raise instead of quietly failing: `select("post", "category", %w(a required field), { include_blank: false }, required: 'required')`
* Merge pull request #20463 from yui-knk/fix/guide1Zachary Scott2015-06-082-2/+2
|\ | | | | [ci skip] Fix hours to minutes in `select_minute`
| * [ci skip] Fix hours to minutes in `select_minute`yui-knk2015-06-072-2/+2
| |
* | Merge pull request #20470 from ↵Zachary Scott2015-06-081-0/+33
|\ \ | | | | | | | | | | | | vngrs/add_missing_docs_for_action_dispatch_session Add missing documentation for ActionDispatch::Request::Session [ci skip]
| * | Add missing documentation for ActionDispatch::Request::Session [ci skip]Mehmet Emin İNAÇ2015-06-071-0/+33
| | |
* | | Merge pull request #20381 from kuldeepaggarwal/engines-docsYves Senn2015-06-081-5/+5
|\ \ \ | | | | | | | | fix docs for Engines [ci skip]
| * | | [ci skip]fix docs for EnginesKuldeep Aggarwal2015-05-301-5/+5
| | | |
* | | | Merge pull request #19571 from kaspth/improve-runner-integrationYves Senn2015-06-0812-293/+298
|\ \ \ \ | | | | | | | | | | | | | | | Improve Test Runner's Minitest integration.
| * | | | Improve test runner's Minitest integration.Kasper Timm Hansen2015-06-0412-293/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also adds free mix and matching of directories, files and lines filters. Like so: bin/rails test models/post_test.rb test/integration models/person_test.rb:26 You can also mix in a traditional Minitest filter: bin/rails test test/integration -n /check_it_out/
* | | | | Merge pull request #20476 from hanachin/fix-core_textKasper Timm Hansen2015-06-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix core_text -> core_ext
| * | | | | Fix core_text -> core_extSeiei Miyagi2015-06-081-1/+1
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #20474 from asanghi/patch-1Arun Agrawal2015-06-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Code fix in CHANGELOG
| * | | | | Code fix in CHANGELOGAditya Sanghi2015-06-081-1/+1
|/ / / / / | | | | | | | | | | :nail: remove extraneous bracket
* | | | | Merge pull request #20460 from mtsmfm/stop-to-s-for-fixture-timestampsSean Griffin2015-06-071-1/+0
|\ \ \ \ \ | | | | | | | | | | | | Stop `to_s(:db)` for fixture's timestamp
| * | | | | Stop `to_s(:db)` for fixture's timestampFumiaki MATSUSHIMA2015-06-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Time instance will be casted so we don't have to do `to_s(:db)`.
* | | | | | Merge pull request #20471 from y-yagi/add_instantiation_to_instrumentation_guideZachary Scott2015-06-071-0/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | add `instantiation.active_record` hook to instrumentation guide [ci skip]
| * | | | | | add `instantiation.active_record` hook to instrumentation guide [ci skip]yuuji.yaginuma2015-06-081-0/+14
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | the hook was added in 2a0d97bc89fc230241453cbbf55621309e1f3ac6
* | | | | | Merge pull request #20472 from Coaxial/patch-1Zachary Scott2015-06-071-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add missing NOTE for Time extensions' location
| * | | | | Add missing NOTE for Time extensions' locationPierre2015-06-071-0/+2
|/ / / / /
* | | | | Merge pull request #20448 from sgrif/sg-postgresql-point-typeSean Griffin2015-06-076-11/+189
|\ \ \ \ \ | | | | | | | | | | | | Return a `Point` object from the PG Point type
| * | | | | Return a `Point` object from the PG Point typeSean Griffin2015-06-056-11/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a deprecation cycle to change the behavior of the default point type in the PostgreSQL adapter. The old behavior will continue to be available for the immediate future as `:legacy_point`. The current behavior of returning an `Array` causes several problems, the most significant of which is that we cannot differentiate between an array of points, and a point itself in the case of a column with the `point[]` type. The attributes API gives us a reasonable way to have a proper deprecation cycle for this change, so let's take advantage of it. If we like this change, we can also add proper support for the other geometric types (line, lseg, box, path, polygon, and circle), all of which are just aliases for string today. Fixes #20441
* | | | | | Merge pull request #20464 from ronakjangir47/active_support_stubbingArthur Nogueira Neves2015-06-0710-309/+366
|\ \ \ \ \ \ | | | | | | | | | | | | | | Removed mocha stubbing in active_support
| * | | | | | Removed mocha stubbing in active_supportRonak Jangir2015-06-0710-309/+366
| | |/ / / / | |/| | | |
* | | | | | Tiny documentation edits [ci skip]Robin Dupret2015-06-073-4/+7
| | | | | |
* | | | | | Merge pull request #20004 from rusikf/patch-1Robin Dupret2015-06-071-0/+31
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | add docs to include option at ActiveModel::Serialization [ci skip]
| * | | | | add docs to include option at ActiveModel::Serialization#serializable_hash ↵rusikf2015-05-111-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | A few documentation tweaks [ci skip]Robin Dupret2015-06-079-14/+22
| | | | | | | | | | | | | | | | | | | | | | | | [Robin Dupret & Shunsuke Aida]
* | | | | | Merge pull request #20462 from yui-knk/fix/guide3Robin Dupret2015-06-071-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | [ci skip] Declare `product` as `_product partial`
| * | | | | [ci skip] Declare `product` as `_product partial`yui-knk2015-06-071-1/+2
|/ / / / /
* | | | | Merge pull request #20456 from akihiro17/fix-bug-reportRafael Mendonça França2015-06-066-6/+36
|\ \ \ \ \ | | | | | | | | | | | | Show an error message if bundler 1.10.x is not installed when reporting bugs
| * | | | | Output an error message and raise an error if bundler 1.10.x is not ↵akihiro172015-06-066-6/+36
|/ / / / / | | | | | | | | | | | | | | | installed when reporting bugs
* | | | | Merge pull request #20423 from Erol/remove-assets-version-documentationRafael Mendonça França2015-06-061-2/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove `config.assets.version` from Configuring Rails Application Guide
| * | | | | Remove reference to assets version option.Erol Fornoles2015-06-031-2/+0
| | | | | |
* | | | | | Merge pull request #20444 from y-yagi/can_use_path_helper_method_in_consoleRafael Mendonça França2015-06-062-0/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | modify console of app method in that can use the path helpers
| * | | | | | modify console of app method in that can use the path helpersyuuji.yaginuma2015-06-052-0/+17
| |/ / / / /
* | | | | | Merge pull request #20452 from repinel/add-bug-report-templates-to-ciRafael Mendonça França2015-06-056-17/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add the bug report templates to the Travis CI build
| * | | | | | Add the bug report templates to the Travis CI buildRoque Pinel2015-06-056-17/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug report templates are now executed from the `ci/travis.rb` when `GEM` contains `guides`. I started by creating a `test` task in `guides/Rakefile` to handle this, but since inline `gemfile` must not be executed with `bundle exec`, that rake task would not be consistent with others. So I went back by executing them directly from `Build`. Use inline Gemfile dependency when reporting gem bugs
* | | | | | | Merge pull request #20442 from arunagw/aa-remove-warning-eager-loadRafael Mendonça França2015-06-051-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Remove warning for setting eager_load
| * | | | | | Remove warning for setting eager_loadArun Agrawal2015-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AppTemplate::Application.new does not run load hooks. To load this configuration we need to use create which will run load hooks to load this configuration.
* | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-06-055-8/+8
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | [ci skip] Add `.`yui-knk2015-06-011-1/+1
| | | | | | |
| * | | | | | [ci skip] Upcase `is`yui-knk2015-05-251-1/+1
| | | | | | |
| * | | | | | [ci skip] Fix typo you/yourclaudiob2015-05-231-1/+1
| | | | | | |
| * | | | | | [ci skip] Upcase `when`yui-knk2015-05-161-1/+1
| | | | | | |
| * | | | | | [ci skip] Fix to a singular form (person has one contact_detail)yui-knk2015-05-161-2/+2
| | | | | | |
| * | | | | | [ci skip] Upcase `SAVEPOINT`yui-knk2015-05-121-1/+1
| | | | | | |
| * | | | | | [ci skip] Fix comment indentyui-knk2015-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See commit 890da514, this is not intended. So fix indent.
* | | | | | | Merge pull request #20443 from teoljungberg/thoughtbot-capitalizationKasper Timm Hansen2015-06-051-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | [ci skip] Fix `thoughtbot` capitalization
| * | | | | | Fix `thoughtbot` capitalizationTeo Ljungberg2015-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The company name is spelled `thoughtbot` per https://github.com/thoughtbot/presskit/blob/master/README.md#name
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-17 03:30:21 +0000