aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove accidental ruby-versionRob Sharp2015-06-121-1/+0
|
* Add missing require to ensure #advance will work without being implicity ↵Rob Sharp2015-06-122-0/+2
| | | | required
* Revert "Add code example for include option of ↵Rafael Mendonça França2015-06-101-14/+1
| | | | | | | | AM::Serialization#serializable_hash" This reverts commit 3d949f34816d6eca0a6b59cfa08d91f36e8e64dd. This was already documented in other PR.
* Merge pull request #20500 from repinel/use-block-not-global-varRafael Mendonça França2015-06-092-3/+3
|\ | | | | Another use block variable instead of global
| * Use block variable instead of globalRoque Pinel2015-06-092-3/+3
|/
* Add code example for include option of AM::Serialization#serializable_hashRadan Skoric2015-06-091-1/+14
|
* Merge pull request #20496 from prathamesh-sonpatki/rm-noteArun Agrawal2015-06-091-4/+0
|\ | | | | Remove NOTE related to format.js [ci skip]
| * Remove NOTE related to format.js [ci skip]Prathamesh Sonpatki2015-06-091-4/+0
|/ | | | | - The example for which this NOTE was written was removed in https://github.com/rails/rails/pull/20493.
* Merge pull request #20493 from dansteele/patch-1Zachary Scott2015-06-091-24/+0
|\ | | | | Removed AJAX example with poor convention adherence
| * Removed AJAX example with poor convention adherenceDaniel Steele2015-06-091-24/+0
|/ | | The removed section promotes putting JS code directly inside the controller, this is not in line with convention.
* Merge pull request #20437 from pwnall/abstract_fixturesRafael Mendonça França2015-06-095-1/+31
|\ | | | | Fix crash when loading fixture with belongs_to association defined in abstract base class
| * Fix crash when loading fixture with belongs_to association defined in ↵Victor Costan2015-06-045-1/+31
| | | | | | | | abstract base class.
* | Merge pull request #20491 from Gaurav2728/gaurav-command_line_guideArun Agrawal2015-06-091-2/+2
|\ \ | | | | | | update Rails Command Line guide page
| * | update Rails Command Line guide pageGaurav Sharma2015-06-091-2/+2
|/ /
* | Tiny documentation edits [ci skip]Robin Dupret2015-06-092-8/+8
| |
* | Merge pull request #20483 from davydovanton/fix-typo-am-testRafael Mendonça França2015-06-081-1/+1
|\ \ | | | | | | Fix typo in AM I18n validation test name
| * | Fix typo in AM I18n validation test name [skip ci]Anton Davydov2015-06-091-1/+1
| | |
* | | Merge pull request #20486 from repinel/improve-gsub-and-global-varsRafael Mendonça França2015-06-081-1/+1
|\ \ \ | | | | | | | | Use block variable instead of global
| * | | Use block variable instead of globalRoque Pinel2015-06-081-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ```ruby Benchmark.ips do |x| x.report("$&") { "foo".gsub(/f/) { $&.hex } } x.report("block var") { "foo".gsub(/f/) { |match| match.hex } } end ``` ``` Calculating ------------------------------------- $& 23.271k i/100ms block var 24.804k i/100ms ------------------------------------------------- $& 321.981k (± 7.4%) i/s - 1.606M block var 324.949k (± 9.2%) i/s - 1.612M ```
* | | remove unused codeAaron Patterson2015-06-081-2/+2
| | |
* | | we only care about methods that the request object responds toAaron Patterson2015-06-081-2/+1
| | | | | | | | | | | | | | | matches? should only deal with methods on the request object, so lets just filter out anything that the request object doesn't respond to
* | | extract required_defaults from the conditions hash before constructing the routeAaron Patterson2015-06-086-56/+56
|/ / | | | | | | | | this way we can remove the strange "respond_to?" conditional in the `matches?` loop
* | Merge pull request #20479 from masarakki/no-scaffold.css-optionRafael Mendonça França2015-06-083-1/+18
|\ \ | | | | | | add option to avoid generating scaffold.css
| * | add option to avoid generating scaffold.cssmasarakki2015-06-093-1/+18
|/ /
* | 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]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 09:04:03 +0000