aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
* | | | Merge pull request #19909 from prathamesh-sonpatki/rm-unused-codeCarlos Antonio da Silva2015-04-261-17/+0
|\ \ \ \ | | | | | | | | | | Removed unused code from request_forgery_protection tests
| * | | | Removed unused code from request_forgery_protection testsPrathamesh Sonpatki2015-04-261-17/+0
|/ / / /
* | | | Merge pull request #19905 from prathamesh-sonpatki/no-readme-linkRafael Mendonça França2015-04-261-1/+1
|\ \ \ \ | |/ / / |/| | | Escape README in Plugin builder API documentation
| * | | Escape README in Plugin builder API documentationPrathamesh Sonpatki2015-04-261-1/+1
|/ / / | | | | | | | | | | | | - So that RDoc will not generate link for README. [ci skip]
* | | Merge pull request #19884 from chancancode/uncomment-byebugGodfrey Chan2015-04-262-1/+5
|\ \ \ | | | | | | | | Uncomment byebug in framework Gemfile
| * | | Uncomment byebug in framework GemfileGodfrey Chan2015-04-242-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | History: 1. `debugger` was there until d2ed433b where it was commented out, and I couldn't figure out why 2. Since then we inherited that when switching to `byebug` in 93559da4 Reasons: 1. It's nice to have a debugger when working on framework bugs 2. It's an uncommented dependency in app Gemfiles since Rails 4.2 (see fbe38c9e)
* | | | Merge pull request #19902 from khundawg/dm-active-support-subsciber-docRichard Schneeman2015-04-251-2/+2
|\ \ \ \ | | | | | | | | | | [ci skip] Update ActiveSupport::Subscriber documentation
| * | | | [ci skip] Update ActiveSupport::Subscriber documentationDAVID MOORE2015-04-251-2/+2
| | | | |
* | | | | Revert "Fix multiple suggestion test"Arthur Neves2015-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 6a7cf515123889360d272e8ab4be045578dfc0fb.
* | | | | Fix multiple suggestion testArthur Neves2015-04-251-1/+1
| | | | |
* | | | | Add test for multiple suggested generator names.Josef Šimánek2015-04-251-0/+6
| | | | |
* | | | | Merge pull request #19892 from derekprior/dp-translate-helper-docsZachary Scott2015-04-251-23/+36
|\ \ \ \ \ | | | | | | | | | | | | Correct translate helper docs [ci skip]
| * | | | | Correct translate helper docs [ci skip]Derek Prior2015-04-241-23/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation previously stated that calling `translate(".foo")` was equivalent to calling `I18n.translate("people.index.foo")` which is incorrect due to the various other functions of the `translate` view helper. This has been fixed. Additionally, a note about forcing the view helper to re-raise exceptions was added to the section detailing the handling of missing translations. Other cleanup includes: * Consistent formatting of code * Stop indenting bulleted list as a code sample * Tighten some of the language * Wrap at 80 characters.
* | | | | | Merge pull request #19899 from tgxworld/fix_docArthur Nogueira Neves2015-04-251-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | No need to capitalize verbs. [CI SKIP]
| * | | | | | No need to capitalize verbs. [CI SKIP]Guo Xiang Tan2015-04-261-2/+2
|/ / / / / /
* | | | | | Minor edits to the "Action View Overview" guideRobin Dupret2015-04-251-18/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up to #19672 and 8b0aa0c1. [ci skip]
* | | | | | :put_litter_in_its_place: Unused methodsAkira Matsuda2015-04-252-12/+0
| | | | | |
* | | | | | :put_litter_in_its_place: Unused methodAkira Matsuda2015-04-251-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | This method is not in use since 479c7cacd5db58ab7200bc1de58c829a1a643278
* | | | | | Why do we add a top-level constant here?Akira Matsuda2015-04-252-9/+5
| | | | | |
* | | | | | Do not show --helper and --assets options in the controller generator helpAkira Matsuda2015-04-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These options are not actually available. Thanks @soutaro for letting me aware of this.
* | | | | | Merge pull request #19894 from thenickcox/deprecated_proxy_docsZachary Scott2015-04-241-22/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] Rework docs, add examples on deprecation proxies
| * | | | | | [ci skip] Rework docs, add examples on deprecation proxiesNick Cox2015-04-241-22/+38
| |/ / / / /
* | | | | | Merge pull request #19236 from sshaw/more_tagged_logging_docsYves Senn2015-04-242-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | More docs on tagged logging [ci skip]