Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Match the controller and path names defensively. | Hiro Asari | 2012-12-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Use '\A' instead of '^', and make the alteration shorter. | |||||
* | | | | Merge pull request #8468 from schneems/schneems/rack-index-page | Santiago Pastorino | 2012-12-10 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | Use Rails to Render Default Index Page | |||||
| * | | | Use Rails to Render Default Index Page | schneems | 2012-12-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an alternative implementation to #7771 thanks to the advice of @spastorino Rails is a dynamic framework that serves a static index.html by default. One of my first questions ever on IRC was solved by simply deleting my public/index.html file. This file is a source of confusion when starting as it over-rides any set "root" in the routes yet it itself is not listed in the routes. By making the page dynamic by default we can eliminate this confusion. This PR moves the static index page to an internal controller/route/view similar to `rails/info`. When someone starts a rails server, if no root is defined, this route will take over and the "dynamic" index page from rails/welcome_controller will be rendered. These routes are only added in development. If a developer defines a root in their routes, it automatically takes precedence over this route and will be rendered, with no deleting of files required. In addition to removing this source of confusion for new devs, we can now use Rails view helpers to build and render this page. While not the primary intent, the added value of "dogfooding" should not be under-estimated. The prior PR #7771 had push-back since it introduced developer facing files. This PR solves all of the same problems, but does not have any new developer facing files (it actually removes one). cc/ @wsouto, @dickeyxxx, @tyre, @ryanb, @josevalim, @maxim, @subdigital, @steveklabnik ATP Railties and Actionpack. | |||||
* | | | | Merge pull request #8476 from sheerun/fix/multipart-get | Rafael Mendonça França | 2012-12-10 | 1 | -1/+5 | |
|\ \ \ \ | |/ / / |/| | | | Prevent raising EOFError on multipart GET request. | |||||
| * | | | Prevent raising EOFError on multipart GET request. | Adam Stankiewicz | 2012-12-10 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Such request can happen on Internet Explorer. When we redirect after multipart form submission, the request type is changed to GET, but Content-Type is preserved as multipart. GET request cannot have multipart body and that caused Rails to fail. It's similar fix to Rack's one: https://github.com/chneukirchen/rack/blob/8025a4ae9477d1e6231344c2b7d795aa9b3717b6/lib/rack/request.rb#L224 | |||||
* | | | | Revert "API reader should look elsewhere for helper instructions" | Vijay Dev | 2012-12-09 | 1 | -24/+0 | |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ba2d867b2961b5ef72aad353c2d647b04654cbe3. Reason: https://github.com/lifo/docrails/commit/ba2d867b2961b5ef72aad353c2d647b04654cbe3#commitcomment-2276670 [ci skip] | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-12-08 | 2 | -2/+40 | |
|\ \ \ | ||||||
| * | | | API reader should look elsewhere for helper instructions | Thiago Pinto | 2012-12-06 | 1 | -0/+24 | |
| | | | | ||||||
| * | | | complementary options guidelines for f.file_field and file_field_tag | Thiago Pinto | 2012-12-06 | 2 | -0/+8 | |
| | | | | ||||||
| * | | | adding example for f.file_input | Thiago Pinto | 2012-12-06 | 1 | -0/+3 | |
| | | | | ||||||
| * | | | adding example for f.file_input | Thiago Pinto | 2012-12-06 | 1 | -0/+3 | |
| | | | | ||||||
| * | | | correct bad jquery syntax | Thiago Pinto | 2012-12-06 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | use `_action` instead of `_filter` callbacks | Francesco Rodriguez | 2012-12-07 | 2 | -8/+8 | |
| | | | | ||||||
* | | | | update documentation and code to use _action callbacks | Francesco Rodriguez | 2012-12-07 | 2 | -7/+7 | |
| | | | | ||||||
* | | | | fix prepend_before_filter documentation [ci skip] | Francesco Rodriguez | 2012-12-07 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | Rename all action callbacks from *_filter to *_action | David Heinemeier Hansson | 2012-12-07 | 1 | -64/+86 | |
| |/ / |/| | | ||||||
* | | | Revert "Invert precedence of content in ActionDispatch::Static" | Andrew White | 2012-12-07 | 1 | -11/+7 | |
| | | | | | | | | | | | | This reverts commit c59734f756b79c39486c45273d2cc5d42cd0c864. | |||||
* | | | Invert precedence of content in ActionDispatch::Static | Andrew White | 2012-12-06 | 1 | -7/+11 | |
| |/ |/| | | | | | | | | | | | | | | | | | This commit inverts the precedence in ActionDispatch::Static so that dynamic content will be served before static content. This is so that precompiled assets do not inadvertently get included when running in development mode - it should have no effect in production where static files are usually handled by the web server. Closes #6421 | |||||
* | | Merge pull request #8371 from freegenie/5396-conditional-fragment-caching | Rafael Mendonça França | 2012-12-05 | 1 | -1/+13 | |
|\ \ | | | | | | | | | | | | | Allow fragment cache to accept :if and :unless options. Closes #5396 | |||||
| * | | Allow fragment cache to accept :if and :unless options | Fabrizio Regini | 2012-12-05 | 1 | -1/+13 | |
| | | | | | | | | | | | | [Stephen Ausman + Fabrizio Regini] | |||||
* | | | Merge pull request #8412 from ↵ | Rafael Mendonça França | 2012-12-05 | 1 | -18/+14 | |
|\ \ \ | |/ / |/| | | | | | | | | JoeyButler/action_dispatch_routing_mapper_refactoring Extract method refactoring. | |||||
| * | | Extract method refactoring in ActionDispatch::Routing::SingletonResource. | Joey Butler | 2012-12-05 | 1 | -18/+14 | |
| | | | ||||||
* | | | Merge pull request #8404 from freegenie/filter_redirects | Andrew White | 2012-12-05 | 4 | -1/+40 | |
|\ \ \ | ||||||
| * | | | Adding filter capability to ActionController logs | Fabrizio Regini | 2012-12-05 | 4 | -1/+40 | |
| | |/ | |/| | ||||||
* / | | Replace comments' non-breaking spaces with spaces | claudiob | 2012-12-04 | 2 | -3/+3 | |
|/ / | | | | | | | | | | | | | | | | | | | Sometimes, on Mac OS X, programmers accidentally press Option+Space rather than just Space and don’t see the difference. The problem is that Option+Space writes a non-breaking space (0XA0) rather than a normal space (0x20). This commit removes all the non-breaking spaces inadvertently introduced in the comments of the code. | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-12-04 | 22 | -283/+232 | |
|\ \ | | | | | | | | | | | | | Conflicts: guides/source/migrations.md | |||||
| * | | copy edits [ci skip] | Vijay Dev | 2012-12-04 | 4 | -27/+18 | |
| | | | ||||||
| * | | Fix a typo in ActionController::Caching | Jean Boussier | 2012-12-03 | 1 | -2/+1 | |
| | | | ||||||
| * | | Remove nodoc from FlashHash #[]= [ci skip] | Pablo Torres | 2012-12-01 | 1 | -1/+1 | |
| | | | ||||||
| * | | Cleans and removes 'Examples' tag [ci skip] | Alvaro Pereyra | 2012-12-01 | 2 | -4/+0 | |
| | | | ||||||
| * | | Cleans and removes useless 'Examples' tag [ci skip] | Alvaro Pereyra | 2012-12-01 | 6 | -62/+44 | |
| | | | ||||||
| * | | Add documentation to AssetTagHelper#image_alt [ci skip] | Florent Guilleux | 2012-12-01 | 1 | -0/+3 | |
| | | | ||||||
| * | | Fixes wrong typo on FormHelper [ci skip] | Alvaro Pereyra | 2012-12-01 | 1 | -1/+1 | |
| | | | ||||||
| * | | Cleans documentation from Helpers [ci skip] | Alvaro Pereyra | 2012-12-01 | 5 | -121/+98 | |
| | | | ||||||
| * | | Revert "Remove trailing whitespaces" | Florent Guilleux | 2012-12-01 | 2 | -2/+2 | |
| | | | | | | | | | | | | This reverts commit 90c887fa7d0c454b7533e208daefc342dea4d5f3. | |||||
| * | | Remove trailing whitespaces | Florent Guilleux | 2012-12-01 | 2 | -2/+2 | |
| | | | ||||||
| * | | Improves documentation of Capture helper [ci skip] | Alvaro Pereyra | 2012-12-01 | 2 | -14/+13 | |
| | | | ||||||
| * | | Removes :nodoc: tag on AtomFeedHelper [ci skip] | Alvaro Pereyra | 2012-12-01 | 1 | -3/+3 | |
| | | | ||||||
| * | | Removes unneeded 'Example' tags and whitespaces [ci skip] | Alvaro Pereyra | 2012-12-01 | 1 | -45/+42 | |
| | | | ||||||
| * | | nodoc AD & AV railties classes | Carlos Duclos | 2012-12-01 | 2 | -2/+2 | |
| | | | ||||||
| * | | Remove :nodoc from SanitizeHelper module [ci skip] | HPNeo | 2012-12-01 | 1 | -1/+1 | |
| | | | ||||||
| * | | Removes :nodoc: label [ci skip] | Alvaro Pereyra | 2012-12-01 | 1 | -1/+1 | |
| | | | ||||||
| * | | Improves documentation on favicon_link_tag | Alvaro Pereyra | 2012-12-01 | 1 | -14/+16 | |
| | | | ||||||
| * | | Update documentation for javascript_include_tag [ci skip] | HPNeo | 2012-12-01 | 1 | -10/+13 | |
| | | | ||||||
* | | | Fixed issue where routes with globs caused constraints on that glob to | Maura Fitzgerald | 2012-12-04 | 1 | -1/+1 | |
| |/ |/| | | | | | | | | | be ignored. A regular expression constraint gets overwritten when the routes.rb file is processed. Changed the overwriting to an ||= instead of an = assignment. | |||||
* | | Override <%== to always behave as literal text rather than toggling based on ↵ | Jeremy Kemper | 2012-12-03 | 1 | -0/+11 | |
| | | | | | | | | whether escaping is enabled. Fixes that existing plaintext email templates using <%== unexpectedly flipped to *escaping* HTML when #8235 was merged. | |||||
* | | More descriptive error when rendering a partial with `:layout => true` | Yves Senn | 2012-12-02 | 1 | -1/+1 | |
|/ | ||||||
* | hash filters should be accessed with symbols or strings | Francesco Rodriguez | 2012-11-30 | 1 | -3/+5 | |
| | ||||||
* | added examples when options is string | Takehiro Adachi | 2012-11-29 | 1 | -3/+9 | |
| | ||||||
* | Remove observers and sweepers | Rafael Mendonça França | 2012-11-28 | 2 | -121/+2 | |
| | | | | | | | | They was extracted from a plugin. See https://github.com/rails/rails-observers [Rafael Mendonça França + Steve Klabnik] |