aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Remove double declaration of memcache services on travisKamil Kieliszczyk2014-04-281-1/+0
|/ / / / /
* | | | | Revert "Don't rely on Arel master in bug report template [ci skip]"Godfrey Chan2014-04-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fd6d7835. We are back on arel master, see b395265f.
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-04-272-1/+55
|\ \ \ \ \
| * | | | | Revert "Running AR tests on postgres, mysql & sqlite"Vijay Dev2014-04-271-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 28bd442034e0974d0a4d664076dafb8e9555816d. Reason: Existing text was clearer imo. [ci skip]
| * | | | | Revert "Document ActionController::TestCase::Behavior::ClassMethods.process"Vijay Dev2014-04-271-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2aef9fddf8b4487a05638ea3341dfd65ceb229ef. Reason: The added change isn't clear in terms of explaining the arguments. Will ask the author to provide a PR and take it forward. [ci skip]
| * | | | | Revert "Revert "Revert "update doc, assert_template also accepts false"""Xavier Noria2014-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert Festival! I reverted a reverted commit, undo. This reverts commit 07ea37763d62e57d5709ab37da01b2848d12edd5.
| * | | | | Revert "Revert "update doc, assert_template also accepts false""Xavier Noria2014-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: docrails policy is very strict about code. No matter how innocent the change, if it is not documentation it needs to go through a PR to rails/rails. Plase see the warning box at the bottom of http://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html#contributing-to-the-rails-documentation This reverts commit e1c5d24369440857de1402d61c85d982b29d8019.
| * | | | | Revert "update doc, assert_template also accepts false"Gaurish Sharma2014-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9b1c077c91f09b64b8105f31fdf5240cd12c2e16. my bad. `assert_template` only accepts a String, Symbol, Hash, Regexp or nil. `false`(layout: false) is provided as a Hash.
| * | | | | Running AR tests on postgres, mysql & sqliteGaurish Sharma2014-04-211-10/+5
| | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Document ActionController::TestCase::Behavior::ClassMethods.processGaurish Sharma2014-04-201-0/+12
| | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | update doc, assert_template also accepts falseGaurish Sharma2014-04-201-1/+1
| | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Remove reference to outdated section Gaurish Sharma2014-04-201-1/+1
| | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | [ci skip] Added example for number_field_tag methodZENATI YASSINE2014-04-191-0/+28
| | | | | |
| * | | | | [ci skip] Added example for date_field_tag methodZENATI YASSINE2014-04-191-0/+13
| | | | | |
| * | | | | [ci skip] Added example for email_field_tag methodZENATI YASSINE2014-04-191-0/+13
| | | | | |
* | | | | | Generators, remove leftover variable assignment. refs #14877Yves Senn2014-04-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last uses of this variable was removed with the `--builder` option. 2da5ea1c9feb4a7b491bd00bd6ffd931b9203da8
* | | | | | Merge pull request #14872 from jonatack/patch-7Vijay Dev2014-04-271-6/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Grammar and formatting fixes in Form Helpers Guide
| * | | | | | Grammar and formatting fixes in Form Helpers GuideJon Atack2014-04-251-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved version of #14851 after helpful feedback from @robin850 and @matthewd. [skip ci]
* | | | | | | Merge pull request #14874 from arunagw/aa-warning-removed-missmatchedGuillermo Iguaran2014-04-261-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Warning removed for missmatched indentation
| * | | | | | | Warning removed for missmatched indentationArun Agrawal2014-04-261-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #14875 from ↵Lauro Caetano2014-04-251-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/fix-extract-handler-format-variant-doc Fix documentation of extract_handler_and_format_and_variant [ci skip]
| * | | | | | | Fix documentation of extract_handler_and_format_and_variant [ci skip]Prathamesh Sonpatki2014-04-261-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #14853 from kassio/kb-fix-custom-join-table-habtmYves Senn2014-04-254-2/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix to use custom join table in habtm
| * | | | | | | | Fix custom join_table name on habtm reflectionsKassio Borges2014-04-254-2/+15
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When used a custom join_table name on a habtm, rails was not saving it on Reflections. This causes a problem when rails loads fixtures, because it uses the reflections to set database with fixtures.
* | | | | | | | Merge pull request #14873 from jonatack/patch-8Yves Senn2014-04-251-5/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Fix code & improve grammar in "Forms to External Resources" [ci skip]
| * | | | | | | Fix code & grammar in Form Helpers GuideJon Atack2014-04-251-5/+5
|/ / / / / / / | | | | | | | | | | | | | | in the "Forms to External Resources" section [skip ci]
* | | | | | | Merge branch 'master' into adequaterecordAaron Patterson2014-04-2539-380/+634
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (28 commits) move AR length validation tests into separate test-case. No need for trailing slash on migration path. reset `@arel` when modifying a Relation in place. PostgreSQL Timestamps always map to `:datetime`. [ci skip] Improve formatting and yml Fix a typo in the doc of forty_two AR FinderMethod Improve readability of contributing to rails guide. [ci skip] Precompile the image we're referencing, too. `ActiveRecord::Base.no_touching` no longer triggers callbacks or start empty transactions. Fixed an issue with migrating legacy json cookies. Correct comment [ci skip] Perfer to define methods instead of calling test Fix syntax error Add CHANGELOG entry for #14757 [ci skip] Fix run-on sentences and improve grammar [skip ci] Add test for using ActionView::Helpers::FormHelper.label with block and html select! renamed to avoid name collision Array#select! Rearrange deck chairs on the titanic. Organize connection handling test cases. Change favicon_link_tag helper mimetype from image/vnd.microsoft.icon to image/x-icon. ActionController::Renderers documentation fix ...
| * | | | | | move AR length validation tests into separate test-case.Yves Senn2014-04-242-42/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/test/cases/validations/association_validation_test.rb
| * | | | | | No need for trailing slash on migration path.Jeremy Kemper2014-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Causes a double // in Dir.glob that breaks Ruby 2.2-trunk. Not really a bug, but not relevant to this test either. Originally added in ed21f0c50270139ddb6993acfdaea4586ffd09a3
| * | | | | | reset `@arel` when modifying a Relation in place.Yves Senn2014-04-243-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | /cc @tenderlove
| * | | | | | Merge pull request #14859 from jefflai2/datetime_typeYves Senn2014-04-242-6/+15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | PostgreSQL Timestamps always map to `:datetime`.
| | * | | | | | PostgreSQL Timestamps always map to `:datetime`.Jefferson Lai2014-04-242-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PG Adapter should use `:datetime` consistently instead of mapping mispellings to `:timestamp`. See #14513
| * | | | | | | Merge pull request #14856 from Gaurav2728/gaurav-typo_fixSantiago Pastorino2014-04-241-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | [ci skip] Improve formatting and yml
| | * | | | | | [ci skip] Improve formatting and ymlGaurav Sharma2014-04-241-2/+2
| |/ / / / / /
| * | | | | | Merge pull request #14858 from ebouchut/patch-1Robin Dupret2014-04-241-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix a typo in the doc of forty_two AR FinderMethod [ci skip]
| | * | | | | | Fix a typo in the doc of forty_two AR FinderMethodEric Bouchut2014-04-241-1/+1
| |/ / / / / /
| * | | | | | Merge pull request #14843 from ↵Santiago Pastorino2014-04-231-5/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tgxworld/improve_readability_of_contributing_to_rails_guide [ci skip] Improve readability of contributing to rails guide.
| | * | | | | | Improve readability of contributing to rails guide. [ci skip]Guo Xiang Tan2014-04-231-5/+5
| | | | | | | |
| * | | | | | | Merge pull request #14852 from matthewd/fix_build_for_assetsRafael Mendonça França2014-04-231-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix railties asset tests: precompile the image we're referencing
| | * | | | | | | Precompile the image we're referencing, too.Matthew Draper2014-04-241-2/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can't compile a file that references a non-compiled asset's path. .. unless you turn off asset runtime errors. Outside of a test case like this, `config.assets.precompile` would normally retain its default entry, which precompiles all images (and other non-JS/CSS files) that are in `app/assets`.
| * | | | | | | Merge pull request #14842 from lucasmazza/lm-no-touching-callbacksYves Senn2014-04-233-2/+27
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Move `NoTouching` down the inheritance chain on AR::Base
| | * | | | | | | `ActiveRecord::Base.no_touching` no longer triggers callbacks or start empty ↵Lucas Mazza2014-04-233-2/+27
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transactions. Closes #14841.
| * | | | | | | Merge pull request #14850 from chancancode/fix_json_cookie_jarGuillermo Iguaran2014-04-233-2/+132
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixed an issue with migrating legacy json cookies.
| | * | | | | | | Fixed an issue with migrating legacy json cookies.Godfrey Chan2014-04-233-2/+132
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the `VerifyAndUpgradeLegacySignedMessage` assumes all incoming cookies are marshal-encoded. This is not the case when `secret_token` is used in conjunction with the `:json` or `:hybrid` serializer. In those case, when upgrading to use `secret_key_base`, this would cause a `TypeError: incompatible marshal file format` and a 500 error for the user. Fixes #14774. *Godfrey Chan*
| * | | | | | | Merge pull request #14840 from akshay-vishnoi/doc_changesArthur Nogueira Neves2014-04-231-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Correct comment [ci skip]
| | * | | | | | Correct comment [ci skip]Akshay Vishnoi2014-04-231-2/+2
| | | | | | | |
| * | | | | | | Perfer to define methods instead of calling testRafael Mendonça França2014-04-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This file is using this pattern already
| * | | | | | | Fix syntax errorRafael Mendonça França2014-04-221-0/+1
| | | | | | | |
| * | | | | | | Add CHANGELOG entry for #14757 [ci skip]Rafael Mendonça França2014-04-221-0/+6
| | | | | | | |
| * | | | | | | Merge pull request #14757 from estsauver/14752Rafael Mendonça França2014-04-225-6/+19
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix behavior of select! to be consistent with select #14752
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 06:09:49 +0000