Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | use hash fetches to populate the :id value | Aaron Patterson | 2012-05-02 | 1 | -12/+7 |
| | |||||
* | imported options, switched to object composition | Aaron Patterson | 2012-05-02 | 1 | -13/+56 |
| | |||||
* | * move exception message to exception constructor | Aaron Patterson | 2012-05-02 | 1 | -5/+11 |
| | | | | | * save original exception * keep original backtrace | ||||
* | Merge pull request #6116 from romanvbabenko/refactor/executable_rakefiles | Jeremy Kemper | 2012-05-02 | 1 | -1/+0 |
|\ | | | | | Rakefile executable attributes and shebang lines has been removed | ||||
| * | Rakefile executable attributes and shebang lines has been removed | Roman V. Babenko | 2012-05-02 | 1 | -1/+0 |
| | | |||||
* | | ActionPack routes: remove some useless code. | Bogdan Gusiev | 2012-05-02 | 1 | -26/+4 |
|/ | |||||
* | ActionPack: remove tests for hash_for_* methods | Bogdan Gusiev | 2012-05-02 | 1 | -18/+0 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-01 | 7 | -20/+18 |
|\ | |||||
| * | Fix rdoc formatting in Mime::Type | Mark Rushakoff | 2012-04-29 | 1 | -5/+5 |
| | | |||||
| * | Reword polymorphic routes + mounted engine rdoc | Mark Rushakoff | 2012-04-29 | 1 | -8/+6 |
| | | | | | | | | Also correctly indent its example code. | ||||
| * | Code-format references to config settings | Mark Rushakoff | 2012-04-27 | 4 | -4/+4 |
| | | |||||
| * | More using <tt>x</tt> instead of +x+ when the latter renders improperly. | Mark Rushakoff | 2012-04-27 | 2 | -3/+3 |
| | | |||||
* | | distance_of_time_in_words: Add/tweak comments to understand time intervals ↵ | Elliot Winkler | 2012-04-30 | 2 | -18/+32 |
| | | | | | | | | better | ||||
* | | distance_of_time_in_words: 45-60 days is about 2 months, not about 1 month | Elliot Winkler | 2012-04-30 | 2 | -3/+6 |
| | | |||||
* | | Merge pull request #5705 from lest/patch-3 | Jeremy Kemper | 2012-04-30 | 2 | -1/+10 |
|\ \ | | | | | | | split CDATA end token in cdata_section helper | ||||
| * | | split CDATA end token in cdata_section helper | Sergey Nartimov | 2012-04-30 | 2 | -1/+10 |
| | | | |||||
* | | | Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_stores | José Valim | 2012-04-30 | 2 | -0/+14 |
|\ \ \ | | | | | | | | | Support cookie jar options for all cookie stores | ||||
| * | | | Support cookie jar options for all cookie stores | brainopia | 2012-04-30 | 2 | -0/+14 |
| | | | | |||||
* | | | | Merge pull request #6082 from brainopia/smarter_cookie_jar | José Valim | 2012-04-30 | 2 | -15/+46 |
|\ \ \ \ | | | | | | | | | | | Stream cookies only if needed | ||||
| * | | | | Dont stream back cookie value if it was set to the same value | brainopia | 2012-04-30 | 2 | -4/+18 |
| | | | | | |||||
| * | | | | Dont set cookie header for deletion of unexisting data | brainopia | 2012-04-30 | 2 | -9/+26 |
| | | | | | |||||
| * | | | | Simplify matching with array of possible domains | brainopia | 2012-04-30 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Use more appropriate one-liner for class declaration | brainopia | 2012-04-30 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #6083 from brainopia/remove_unused_closed_ivars | José Valim | 2012-04-30 | 2 | -2/+0 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Remove a couple of unused ivars left from previous refactoring | ||||
| * | | | | Remove unused ivars left from close checks | brainopia | 2012-04-30 | 2 | -2/+0 |
| | |/ / | |/| | | | | | | | | | | These ivars were missed in d142572567 when close checks were removed | ||||
* | | | | Merge pull request #3726 from JanDupal/fix-date-helper-hidden | José Valim | 2012-04-30 | 2 | -0/+34 |
|\ \ \ \ | |_|/ / |/| | | | fix Helpers::DateHelper with :use_hidden - hide separators | ||||
| * | | | fix Helpers::DateHelper with :use_hidden - hide separators | Jan Dupal | 2011-11-22 | 2 | -0/+34 |
| | | | | |||||
* | | | | Merge pull request #6077 from ↵ | José Valim | 2012-04-30 | 4 | -64/+97 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | dmitriy-kiriyenko/improve_signature_of_time_in_words_helper Replace boolean argument with an options hash. | ||||
| * | | | | Replace boolean argument with an options hash. | Dmitriy Kiriyenko | 2012-04-30 | 4 | -64/+97 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces `include_seconds` argument with an option key `include_seconds => true` in options hash. Also `time_ago_in_words` now passes options hash, including a `locale` key, which makes in compatible with `distance_of_time_in_words`. | ||||
* | | | | | Merge pull request #6078 from lest/patch-4 | José Valim | 2012-04-30 | 2 | -18/+23 |
|\ \ \ \ \ | | | | | | | | | | | | | allow send_file/send_data to skip disposition header, closes #2973 | ||||
| * | | | | | no need to dup options in send_data | Sergey Nartimov | 2012-04-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | options aren't modified inside send_file_headers! | ||||
| * | | | | | allow send_file/send_data to skip disposition header, closes #2973 | Sergey Nartimov | 2012-04-30 | 2 | -17/+22 |
| |/ / / / | |||||
* | | | | | Merge pull request #6034 from ↵ | Piotr Sarnacki | 2012-04-30 | 2 | -7/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | willbryant/flash_must_not_load_session_on_every_request_master Fix the Flash middleware loading the session on every request | ||||
| * | | | | | fix the Flash middleware loading the session on every request (very ↵ | Will Bryant | 2012-04-28 | 2 | -7/+3 |
| | |_|_|/ | |/| | | | | | | | | | | | | | dangerous especially with Rack::Cache), it should only be loaded when the flash method is called | ||||
* | | | | | wrap translate defaults to use translate helper features, closes #1102 | Sergey Nartimov | 2012-04-30 | 3 | -1/+41 |
| |/ / / |/| | | | |||||
* | | | | Add note about using 303 See Other for XHR requests other than GET/POST | Andrew White | 2012-04-30 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IE since version 6 and recently Chrome and Firefox have started following 302 redirects from XHR requests other than GET/POST using the original request method. This can lead to DELETE requests being redirected amongst other things. Although it doesn't directly affect the Rails framework since it doesn't return a 302 redirect to any non-GET/POST request a note has been added to raise awareness of the issue. Some references: Original article from @technoweenie: http://techno-weenie.net/2011/8/19/ie9-deletes-stuff/ Hacker News discussion of the article: http://news.ycombinator.com/item?id=2903493 WebKit bug report: https://bugs.webkit.org/show_bug.cgi?id=46183 Firefox bug report and changeset: https://bugzilla.mozilla.org/show_bug.cgi?id=598304 https://hg.mozilla.org/mozilla-central/rev/9525d7e2d20d Chrome bug report: http://code.google.com/p/chromium/issues/detail?id=56373 HTTPbis bug report and changeset: http://trac.tools.ietf.org/wg/httpbis/trac/ticket/160 http://trac.tools.ietf.org/wg/httpbis/trac/changeset/1428 Roy T. Fielding's history of the issue: http://ftp.ics.uci.edu/pub/ietf/http/hypermail/1997q3/0611.html Automated browser tests for the issue: http://www.mnot.net/javascript/xmlhttprequest/ Fixes #4144 | ||||
* | | | | Remove `button_to_function` and `link_to_function` helpers | Rafael Mendonça França | 2012-04-30 | 3 | -65/+2 |
| | | | | |||||
* | | | | Add missing require when helpers are used in isolation | Rafael Mendonça França | 2012-04-30 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #6074 from mark-rushakoff/unused-variables | Jeremy Kemper | 2012-04-29 | 2 | -2/+1 |
|\ \ \ \ | | | | | | | | | | | Remove some unused variable assignments | ||||
| * | | | | Remove unused assignments | Mark Rushakoff | 2012-04-29 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Remove unused assignment in actionpack date helper test | Mark Rushakoff | 2012-04-29 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Restore interpolation of path option in redirect routes | Andrew White | 2012-04-29 | 2 | -1/+42 |
| | | | | | |||||
* | | | | | Escape interpolated params when redirecting - fixes #5688 | Andrew White | 2012-04-29 | 2 | -1/+36 |
| | | | | | |||||
* | | | | | Add failing test case for #6053 | Andrew White | 2012-04-29 | 1 | -0/+21 |
| | | | | | |||||
* | | | | | Fix controller_class_name for anonymous controllers. | Michael Schuerig | 2012-04-29 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #6059 from rafaelfranca/check_box_inverted | José Valim | 2012-04-29 | 2 | -6/+100 |
|\ \ \ \ \ | | | | | | | | | | | | | Change check_box to work inverting the checked and unchecked value | ||||
| * | | | | | Change check_box to work inverting the checked and unchecked value | Rafael Mendonça França | 2012-04-29 | 2 | -6/+100 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes: * Boolean with inverted logic * Integer with inverted logic * BigDecimal with inverted logic Fixes #3995 | ||||
* | | | | | Merge pull request #6006 from ↵ | José Valim | 2012-04-29 | 5 | -16/+39 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | carlosantoniodasilva/partial-layout-collection-item Partial layout collection item | ||||
| * | | | | | Add changelog entry and some docs for collection + layout | Carlos Antonio da Silva | 2012-04-29 | 2 | -3/+10 |
| | | | | | | |||||
| * | | | | | Move layout logic with collection to be handled only with explicit template ↵ | Carlos Antonio da Silva | 2012-04-29 | 1 | -15/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is given Layout is never an available option when rendering with the shortcut `render @collection`. |