aboutsummaryrefslogtreecommitdiffstats
path: root/guides
Commit message (Collapse)AuthorAgeFilesLines
* docs, update broken link. [ci skip]Yves Senn2014-02-101-2/+2
| | | | from https://github.com/rack/rack/blob/master/lib/rack/server.rb#L289-L300.
* `Rails.threadsafe!` mode is deprecatedGaurish Sharma2014-02-101-1/+1
| | | | [ci skip]
* Simplify doc [ci skip]Vijay Dev2014-02-091-1/+1
| | | | | | The `as` option was already explained in a previous example and doesn't need to be repeated. Explain only the `locals` option which the example is meant for.
* Merge pull request #13630 from seapy/masterVijay Dev2014-02-091-2/+2
|\ | | | | Fixed typo [ci skip]
| * Fixed typo [ci skip]seapy2014-01-081-2/+2
| | | | | | | | singular is more suited to
* | Merge pull request #13994 from elysdir/masterVijay Dev2014-02-091-3/+3
|\ \ | | | | | | Clarifying confusing phrasing
| * | Clarifying confusing phrasingJed Hartman2014-02-091-3/+3
| | |
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-02-095-6/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Conflicts: guides/source/active_record_validations.md guides/source/api_documentation_guidelines.md guides/source/configuring.md
| * | Fixed a grammatical error in Booleans section of API documentation guideZachary Scott2014-02-091-1/+1
| | | | | | | | | | | | from e1e17a5
| * | adds a section about booleans in the API guidelines [ci skip]Xavier Noria2014-02-091-0/+47
| | |
| * | Use full-length version of multiple from c7abc51Zachary Scott2014-02-091-1/+1
| | |
| * | docs, link MySQL manual for multi column indexes. [ci ckip].Yves Senn2014-02-091-1/+3
| | | | | | | | | | | | Closes #9131.
| * | Fixed spelling error: `extracetd` => `extracted`Calvin Tam2014-02-071-1/+1
| | |
| * | Remove old comments about suppressing warnings.Vipul A M2014-01-251-1/+1
| | |
| * | `framwork` => `framework`Vipul A M2014-01-241-1/+1
| | |
| * | `easiy` => `easy`Vipul A M2014-01-241-1/+1
| | |
| * | `requies` => `requires`Vipul A M2014-01-241-1/+1
| | |
| * | Remove duplicate configuration option for ActiveSupport [ci skip]Zachary Scott2014-01-161-1/+0
| | | | | | | | | | | | Fixes rails/rails#13732
* | | Remove end of line whitespace from bb87c16Zachary Scott2014-02-091-4/+4
| | |
* | | Merge pull request #13952 from prathamesh-sonpatki/testingYves Senn2014-02-071-1/+1
|\ \ \ | | | | | | | | [Testing Guide] Mention :unauthorized in assert_response explanation [ci skip]
| * | | [Testing Guide] Mention :unauthorized in assert_response explanation [ci skip]Prathamesh Sonpatki2014-02-071-1/+1
| | | |
* | | | Fix wordy sentenceMatthew Nicholas Bradley2014-02-071-6/+5
|/ / /
* | | Merge branch 'dump-schema-after-migration-flag' of ↵Xavier Noria2014-02-061-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | git://github.com/emilsoman/rails into emilsoman-dump-schema-after-migration-flag Conflicts: activerecord/CHANGELOG.md
| * | | Add config to disable schema dump after migrationEmil Soman2014-02-061-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add a config on Active Record named `dump_schema_after_migration` * Schema dump doesn't happen if the config is set to false * Set default value of the config to true * Set config in generated production environment file to false * Update configuration guide * Update CHANGELOG
* | | | docs, Associations also raise on name conflicts. [ci skip]Yves Senn2014-02-061-2/+3
| | | | | | | | | | | | | | | | Follow up to https://github.com/rails/rails/commit/580f0b61dc99c6854fa930a761d28a3ab08163f7#commitcomment-5293470
* | | | synchronize 4.1 release notes with CHANGELOGS. [ci skip]Yves Senn2014-02-061-4/+77
| | | | | | | | | | | | | | | | /cc @chancancode
* | | | update contribution doc grammar. [ci skip]dpmehta022014-02-061-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Manually applied from #13951. - Discussion at #13947. - Removed trailing whitespace from https://github.com/dpmehta02/rails/commit/18044e86af93672dfc38befbe974261e87b3518d /cc @dpmehta02
* | | | Removed unused commented code [ci skip]Arun Agrawal2014-02-051-1/+0
| | | | | | | | | | | | | | | | | | | | As discussed in #13940 this can be removed We can document this somewhere else in testing guides.
* | | | Fixed typos [ci skip]Calvin Tam2014-02-051-2/+2
|/ / /
* | | Merge pull request #13943 from loganhasson/masterRafael Mendonça França2014-02-041-1/+1
|\ \ \ | | | | | | | | [ci skip] Add missing 'task' to note on Running Migrations
| * | | [ci skip] Add missing 'task' to note on Running MigrationsLogan Hasson2014-02-041-1/+1
| | | |
* | | | add missing sharp [ci skip]Greg Molnar2014-02-041-1/+1
| | | |
* | | | docs, link MySQL manual for multi column indexes. [ci ckip].Yves Senn2014-02-041-1/+3
| | | | | | | | | | | | | | | | Closes #9131.
* | | | Missing closing parenthesis.edogawaconan2014-02-041-1/+1
| | | |
* | | | docs, reference to ruby-lang.org. refs #13492. [ci skip]Yves Senn2014-02-031-4/+8
| | | |
* | | | `rails_guides/helpers.rb` requires `YAML` to run.Yves Senn2014-02-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve the following error when running `bundle exec rake guides:generate:html`: ``` /Users/senny/.rbenv/versions/2.0.0-p353/bin/ruby rails_guides.rb Generating 2_2_release_notes.md as 2_2_release_notes.html /Users/senny/Projects/rails/guides/rails_guides/helpers.rb:17:in `documents_by_section': uninitialized constant RailsGuides::Helpers::YAML (ActionView::Template::Error) from /Users/senny/Projects/rails/guides/rails_guides/helpers.rb:32:in `docs_for_menu' from /Users/senny/Projects/rails/guides/source/layout.html.erb:56:in `block in ___sers_senny__rojects_rails_guides_source_layout_html_erb___3094858039481335962_70118647133480' from /Users/senny/Projects/rails/guides/source/layout.html.erb:54:in `each' from /Users/senny/Projects/rails/guides/source/layout.html.erb:54:in `___sers_senny__rojects_rails_guides_source_layout_html_erb___3094858039481335962_70118647133480' from /Users/senny/Projects/rails/actionview/lib/action_view/template.rb:143:in `block in render' from /Users/senny/Projects/rails/activesupport/lib/active_support/notifications.rb:161:in `instrument' from /Users/senny/Projects/rails/actionview/lib/action_view/template.rb:337:in `instrument' from /Users/senny/Projects/rails/actionview/lib/action_view/template.rb:141:in `render' from /Users/senny/Projects/rails/actionview/lib/action_view/renderer/template_renderer.rb:61:in `render_with_layout' from /Users/senny/Projects/rails/actionview/lib/action_view/renderer/template_renderer.rb:47:in `render_template' from /Users/senny/Projects/rails/actionview/lib/action_view/renderer/template_renderer.rb:17:in `render' from /Users/senny/Projects/rails/actionview/lib/action_view/renderer/renderer.rb:42:in `render_template' from /Users/senny/Projects/rails/actionview/lib/action_view/renderer/renderer.rb:23:in `render' from /Users/senny/Projects/rails/actionview/lib/action_view/helpers/rendering_helper.rb:24:in `render' from /Users/senny/Projects/rails/guides/rails_guides/markdown.rb:160:in `render_page' from /Users/senny/Projects/rails/guides/rails_guides/markdown.rb:25:in `render' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:205:in `block in generate_guide' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:195:in `open' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:195:in `generate_guide' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:144:in `block in generate_guides' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:142:in `each' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:142:in `generate_guides' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:97:in `generate' from rails_guides.rb:63:in `<main>' rake aborted! Command failed with status (1): [/Users/senny/.rbenv/versions/2.0.0-p353/bi...] /Users/senny/Projects/rails/guides/Rakefile:11:in `block (3 levels) in <top (required)>' Tasks: TOP => guides:generate:html (See full trace by running task with --trace) ```
* | | | Fixed minor typo [ci skip]Calvin Tam2014-02-031-1/+1
| | | |
* | | | Merge pull request #13780 from rohitpaulk/patch-1Rafael Mendonça França2014-01-311-0/+13
|\ \ \ \ | | | | | | | | | | Updated association_basics.md
| * | | | Updated association_basics.md [ci skip]Rohit Paul Kuruvilla2014-01-311-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated association_basics.md to include how to write migrations for self joins Update association_basics.md Corrected the update Update association_basics.md Typo fix Changed :employee to :manager
* | | | | Document default trim mode for Erubis and affected ERB tags [ci skip]Zachary Scott2014-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes #12963
* | | | | fix typo and indent. [ci skip]Yves Senn2014-01-301-1/+1
| | | | |
* | | | | Merge pull request #13774 from prathamesh-sonpatki/post-to-articleYves Senn2014-01-3020-407/+429
|\ \ \ \ \ | | | | | | | | | | | | Replace Post model with Article model in getting started guide [ci skip]
| * | | | | Replace Post with Article in getting started guide [ci skip]Prathamesh Sonpatki2014-01-2520-407/+429
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Used Article model instead of Post as it may confuse with 'post' requests - Tried to wrap the guide to 80 chars lines as much as possible. - Removed unused image - Fixes #13764
* | | | | Improve documentation [ci skip]Rafael Mendonça França2014-01-301-2/+3
| | | | |
* | | | | Add `travel_back` to remove stubs from `travel` and `travel_to`Rafael Mendonça França2014-01-301-0/+3
| | | | |
* | | | | Modify the session serializer implementationGuillermo Iguaran2014-01-301-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Rename allowed options to :marshal and :json, for custom serializers only allow the use of custom classes.
* | | | | Merge pull request #13876 from sowjumn/masterRafael Mendonça França2014-01-291-10/+5
|\ \ \ \ \ | | | | | | | | | | | | Added some style changes in asset pipeline documentation
| * | | | | Added some style changes in asset pipeline documentationsowjanya2014-01-291-10/+5
| | | | | |
* | | | | | Fix documentation of new controller filters api [ci skip]Kassio Borges2014-01-292-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The api for filters with classes change and the guides weren't updated. Now the class must respond for methods with the same name as the filter, so the `before_action` calls a `before` method, and so on. The method `#filter` has been deprecated in 4.0.0 and has been removed in 4.1.0: #7560
* | | | | | Allow session serializer key in config.session_storeLukasz Sarnacki2014-01-291-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MessageEncryptor has :serializer option, where any serializer object can be passed. This commit make it possible to set this serializer from configuration level. There are predefined serializers (:marshal_serializer, :json_serialzier) and custom serializer can be passed as String, Symbol (camelized and constantized in ActionDispatch::Session namepspace) or serializer object. Default :json_serializer was also added to generators to provide secure defalt.