aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19941 from javan/actionmailer-cache-noopRafael Mendonça França2015-04-282-2/+14
|\ | | | | Make ActionMailer #cache helper a no-op, not an exception
| * Make ActionMailer #cache helper a no-op, not an exceptionJavan Makhmali2015-04-282-2/+14
|/
* Merge pull request #19939 from artofhuman/remove-mocha-from-some-testsRafael Mendonça França2015-04-281-10/+13
|\ | | | | Remove use of mocha in the named base tests
| * Remove use of mocha in the named base testsSemyon Pupkov2015-04-281-10/+13
| |
* | Merge pull request #19942 from earthrid/masterZachary Scott2015-04-281-4/+1
|\ \ | | | | | | Rewording
| * | RewordingKevin Busby2015-04-281-4/+1
|/ / | | | | | | | | | | Rewording in accordance with the documentation guidelines (‘Prefer wordings that avoid "you"s and "your”s.’) and to remove in particular “if you'd call”.
* | Merge pull request #19917 from senny/preview_null_mailYves Senn2015-04-285-6/+55
|\ \ | | | | | | Previews when `mail` wasn't called (NullMail instances).
| * | mailer previews for `NullMail` instances. Closes #19849.Yves Senn2015-04-285-6/+47
| | |
| * | mailer previews, make sure labels and values line up.Yves Senn2015-04-282-0/+8
|/ / | | | | | | | | | | While this was true before when every `dd` had a value, this patch makes sure that everything keeps lining up even when the `dd` node is blank.
* | Merge pull request #19932 from axilleas/api_docs_guidelinesYves Senn2015-04-282-2/+7
|\ \ | | | | | | Make sure you execute rake rdoc from rails root directory [ci skip]
| * | Update instructions to build guides locally [ci skip]Achilleas Pipinellis2015-04-282-2/+7
| | | | | | | | | | | | | | | | | | 1. Make clear where rake rdoc is executed 2. Make clear where the generated HTML files for the guides are stored 3. Use bundler 1.3.5 or later
* | | Merge pull request #19935 from eliotsykes/clarify-configuring-default-test-orderCarlos Antonio da Silva2015-04-281-1/+1
|\ \ \ | | | | | | | | Clarify test_order default configuration behaviour [ci skip]
| * | | Clarify test_order default configuration behaviour [ci skip]Eliot Sykes2015-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain config.active_support.test_order defaults to :random in newly-generated applications thanks to generated config/environments/test.rb, otherwise default is :sorted (until Rails 5.0).
* | | | Merge pull request #19937 from tak1n/masterCarlos Antonio da Silva2015-04-281-2/+2
|\ \ \ \ | | | | | | | | | | Fixed typo in documentation
| * | | | fixed typoBenny Klotz2015-04-281-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #19931 from prathamesh-sonpatki/note-about-non-get-linksYves Senn2015-04-281-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | Added note about non-GET links getting converted to GET links in mailer Added note about non-GET links getting converted to GET links in mailer templates [ci skip]
| * | | | Added note about non-GET links getting converted to GET links in mailer ↵Prathamesh Sonpatki2015-04-281-0/+3
| | | | | | | | | | | | | | | | | | | | templates [ci skip]
* | | | | Merge pull request #19930 from axilleas/doc_smtp_plain_auth_fixYves Senn2015-04-281-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | AUTH PLAIN is Base64 encoded [ci skip]
| * | | | AUTH PLAIN is Base64 encoded [ci skip]Achilleas Pipinellis2015-04-281-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contrary to what the name suggests, PLAIN SMTP authentication is not sent in plain text but is Base64 encoded like the LOGIN method. Their difference is described in the third link below. * https://tools.ietf.org/html/rfc4954 * https://en.wikipedia.org/wiki/SMTP_Authentication * http://www.samlogic.net/articles/smtp-commands-reference-auth.htm
* | / / guides, bring back minitest assertion table. [ci skip]Yves Senn2015-04-281-3/+43
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Rails has different naming conventions for the inverse assertion methods. While minitest uses `refute` we use `_not`. We should have a table listing the common assertions that you want to use in the Rails context. Refs #18305.
* | | Merge pull request #19907 from artofhuman/sneakers-updateYves Senn2015-04-282-8/+8
|\ \ \ | | | | | | | | Unlock sneakers adapter version
| * | | Unlock sneakers adapter versionSemyon Pupkov2015-04-282-8/+8
| | | |
* | | | Merge pull request #19546 from DianthuDia/fix_unscope_for_less_thanYves Senn2015-04-283-1/+17
|\ \ \ \ | |_|_|/ |/| | | | | | | Fix unscope for less than
| * | | Fix unscope for less thanTAKAHASHI Kazuaki2015-03-272-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | Code such as the following will be corrected. Developer.where(id: -Float::INFINITY...2).unscope(where: :id)
* | | | Merge pull request #19718 from eagletmt/find_by-without-argYves Senn2015-04-283-4/+17
|\ \ \ \ | |_|_|/ |/| | | | | | | Raise ArgumentError when find_by receives no arguments
| * | | Raise ArgumentError when find_by receives no argumentsKohei Suzuki2015-04-112-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It fixes the strange error saying undefined method `take'. ``` RelationTest#test_find_by_without_arg_behaves_same_with_find_by({}): NoMethodError: undefined method `take' for #<ActiveRecord::QueryMethods::WhereChain:0x007f9c55db1d68> ```
* | | | Merge pull request #19927 from prathamesh-sonpatki/request-forgery-docsYves Senn2015-04-281-5/+6
|\ \ \ \ | |_|_|/ |/| | | Updated request_forgery_protection docs [ci skip]
| * | | Updated request_forgery_protection docs [ci skip]Prathamesh Sonpatki2015-04-281-5/+6
|/ / / | | | | | | | | | | | | | | | - Changed Javascript to JavaScript. - Added full-stop which was missing, also wrapped the sentence to 80 chars. - Changed proc to Proc and oauth to OAuth.
* | | Merge pull request #19919 from piton4eg/patch-3Arthur Nogueira Neves2015-04-271-7/+7
|\ \ \ | | | | | | | | Small punctuation fixes [ci skip]
| * | | Small punctuation fixes [ci skip]Alexey Markov2015-04-271-7/+7
|/ / /
* | | remove trailing whitespace. [ci skip]Yves Senn2015-04-271-1/+1
| | |
* | | Merge pull request #19918 from vngrs/becomes_missing_note_about_stiYves Senn2015-04-271-1/+3
|\ \ \ | | | | | | | | | | | | Add note about sti column value to becomes method [ci skip]
| * | | Add note about sti column value to becomes method [ci skip]Mehmet Emin İNAÇ2015-04-271-2/+4
| | | |
* | | | Add changelog for rake routes default fixArthur Neves2015-04-271-0/+7
| | | | | | | | | | | | | | | | [see #18392]
* | | | Merge pull request #18392 from brainopia/fix_route_requirementsArthur Nogueira Neves2015-04-272-1/+9
|\ \ \ \ | |/ / / |/| | | Correct route requirements by overriding defaultls
| * | | Correct route requirements by overriding defaultls (fixes #18373)brainopia2015-01-082-1/+9
| | | |
* | | | test, for `create_table` and `foreign_key: true` no-op. Closes #19794.Yves Senn2015-04-271-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a test-case to make sure that `create_table` with a `foreign_key: true` and an adapter without foreign key support does not blow up. Motivated by #19794. Originating from: https://github.com/rails/rails/commit/99a6f9e60ea55924b44f894a16f8de0162cf2702#commitcomment-10855210
* | | | Revert "Merge pull request #17920 from ↵Yves Senn2015-04-273-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | calebthompson/dont-rely-on-environment-task-for-schema-load" This reverts commit 08ff4ccbbb3fb143a02e6752efb974a4bcfcd3bb, reversing changes made to 6c9ed6dbc62450cdb87559afd15798305e069146. Caused by #17920. Closes #19545. This patch introduced regressions because initializers were no longer loaded. Specifically missing inflections result in broken restores of the database.
* | | | nodoc private internal constants from ActiveJob::ArgumentsZachary Scott2015-04-261-0/+5
| | | |
* | | | Don't document internal monkey patch for mysql gem [ci skip]Zachary Scott2015-04-261-1/+3
| | | | | | | | | | | | | | | | Also added reference for to_date, as it belongs historically.
* | | | Don't document private internal constant [ci skip]Zachary Scott2015-04-261-0/+1
| | | |
* | | | Merge pull request #19911 from khundawg/dm-active-support-rescuable-rails-docZachary Scott2015-04-262-3/+3
|\ \ \ \ | | | | | | | | | | [ci skip] Update ActiveSupport::Rails and ActiveSupport::Rescuable docs
| * | | | [ci skip] Update ActiveSupport::Rails and ActiveSupport::Rescuable docsDAVID MOORE2015-04-262-3/+3
| | | | | | | | | | | | | | | | | | | | [Dave Moore]
* | | | | Merge pull request #19904 from zzak/rm_route_wrapper_internal_hacksRafael Mendonça França2015-04-261-0/+16
|\ \ \ \ \ | |/ / / / |/| | | | Rm route wrapper internal hacks
| * | | | Remove internal hacks dependent on Sprockets from RouteWrapperZachary Scott2015-04-251-5/+1
| | | | |
| * | | | Fix rake routes for api appsJorge Bejar2015-04-252-1/+21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | | | | Need to add config.assets.compile=true to access `.assets`Arthur Neves2015-04-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sprockets-rails will only add `Rails.application.assets` if compile is no false. See change on sprockets-rails https://github.com/rails/sprockets-rails/commit/d7c7ee19991c565eb77ee143be2d009ba4472122
* | | | | assets:cache:clean wont clean cache anymoreArthur Neves2015-04-261-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | See the behaviour change on sprockets-rails https://github.com/rails/sprockets-rails/commit/56725e5843662189c6701478f7598db306d5fb02
* | | | | Use latest sprockets-rails on internal devArthur Neves2015-04-262-7/+15
| | | | |
* | | | | Don't reference sprockets assets on action packArthur Neves2015-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to ignore the `assets_prefix` when running a command like `rake routes`. However we cannot reference asserts_prefix from action_pack as that is a sprockets-rails concern. See this is now implemented on sprockets-rails https://github.com/rails/sprockets-rails/commit/85b89c44ad40af3056899808475e6e4bf65c1f5a
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 23:43:04 +0000