| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | Merge pull request #5750 from ahoward/master | Aaron Patterson | 2012-04-05 | 1 | -2/+13 | |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | mo fasta and mo betta the url_for | |||||
| | * | | | | url_for: avoid a nil check. unroll a loop. handle most common case 1st. | ara.t.howard | 2012-04-05 | 1 | -18/+13 | |
| | | | | | | ||||||
| | * | | | | carefully and quickly merge url_for options | ara.t.howard | 2012-04-04 | 1 | -1/+17 | |
| | | |_|/ | |/| | | ||||||
| * | | | | Merge pull request #5707 from morgoth/remove-unnecessary-block-in-fetch | Xavier Noria | 2012-04-05 | 1 | -1/+1 | |
| |\ \ \ \ | | | | | | | | | | | removed unnecessary block when using fetch | |||||
| | * | | | | removed unnecessary block when using fetch | Wojciech Wnętrzak | 2012-04-02 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #4446 from ayamomiji/patch-1 | José Valim | 2012-04-05 | 1 | -1/+1 | |
| |\ \ \ \ \ | |_|/ / / |/| | | | | prevent the cache sweeper ignores NoMethodError | |||||
| | * | | | | prevent the cache sweeper ignores NoMethodError | ayaya | 2012-03-29 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #5716 from jurriaan/tr-gsub-cleanup | Santiago Pastorino | 2012-04-04 | 6 | -8/+8 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Updated/changed unneeded tr/gsubs | |||||
| | * | | | | | Updated/changed useless tr/gsubs | Jurriaan Pruis | 2012-04-03 | 6 | -8/+8 | |
| | | |/ / / | |/| | | | ||||||
| * | | | | | No need to extend ActiveSupport::Extend here | Oscar Del Ben | 2012-04-04 | 1 | -2/+0 | |
| | |_|_|/ |/| | | | ||||||
| * | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-04 | 2 | -3/+3 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/engines.textile | |||||
| | * | | | | Fix AC responder example | Alexey Vakhov | 2012-04-04 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Remove non-obligatory params in AC respond_to examples | Alexey Vakhov | 2012-04-03 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | minor elsif/else typo fix | Tieg Zaharia | 2012-04-03 | 1 | -1/+1 | |
| | |/ / / |/| | | | ||||||
| * | | | | add type option to atom feed entry builder | Sergey Nartimov | 2012-04-01 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | closes #5672 | |||||
| * | | | | Merge pull request #5694 from hardipe/master | Santiago Pastorino | 2012-04-01 | 1 | -4/+0 | |
| |\ \ \ \ | |/ / / |/| | | | Tidy up cookies.rb a bit | |||||
| | * | | | Useless/Confusing method definition removed | hardi | 2012-04-01 | 1 | -4/+0 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-01 | 3 | -3/+2 | |
| |\ \ \ \ | ||||||
| | * | | | | :success includes the whole 200 range, not just 200. | Erich Menge | 2012-04-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | # File lib/rack/response.rb, line 114 114: def successful?; @status >= 200 && @status < 300; end | |||||
| | * | | | | CSRF messages are no longer controlled by 422.html because ↵ | Tony Primerano | 2012-03-28 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | InvalidAuthenticityToken is not raised | |||||
| | * | | | | Fix quotes at select_tag examples | Anderson Dias | 2012-03-28 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Small #label method refactoring, thanks @rafaelfranca | Alexey Vakhov | 2012-04-01 | 1 | -3/+2 | |
| | | | | | | ||||||
| * | | | | | Block version of label should wrapped in field_with_errors in case of error | Alexey Vakhov | 2012-04-01 | 1 | -1/+2 | |
| | |/ / / |/| | | | ||||||
| * | | | | Remove not needed requires | Santiago Pastorino | 2012-03-31 | 1 | -1/+0 | |
| | | | | | ||||||
| * | | | | Merge pull request #5664 from lest/patch-1 | Piotr Sarnacki | 2012-03-31 | 1 | -2/+2 | |
| |\ \ \ \ | | | | | | | | | | | use `symbolize_keys` instead of `dup.symbolize_keys!` | |||||
| | * | | | | use `symbolize_keys` instead of `dup.symbolize_keys!` | Sergey Nartimov | 2012-03-30 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Remove obsolete reader from AC::MethodNotAllowed exception class | Alexey Vakhov | 2012-03-31 | 1 | -2/+0 | |
| | | | | | | ||||||
| * | | | | | Remove AC::RenderError class second declaration | Alexey Vakhov | 2012-03-31 | 1 | -3/+0 | |
| | | | | | | ||||||
| * | | | | | Remove the leading \n added by textarea on assert_select | Santiago Pastorino | 2012-03-30 | 1 | -0/+1 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #5625 from ↵ | José Valim | 2012-03-28 | 2 | -3/+16 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | nertzy/prefix_partial_path_with_controller_namespace Add config option to turn off prefixing partial path with controller namespace | |||||
| | * | | | | Make controller namespace partial prefix optional | Grant Hutchins | 2012-03-28 | 2 | -3/+16 | |
| | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | config.action_view.prefix_partial_path_with_controller_namespace This allows you to choose to render @post using /posts/_post.erb instead of /admin/posts/_post.erb inside Admin::PostsController. | |||||
| * | | | | Merge pull request #5359 from avakhov/missed-commits-from-3-2-stable | Santiago Pastorino | 2012-03-28 | 2 | -1/+2 | |
| |\ \ \ \ | |/ / / |/| | | | Missed commits from 3-2-stable | |||||
| | * | | | datetime_select should work with -/+ infinity dates | Joe Van Dyk | 2012-03-28 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Add a test case for layout nil. | José Valim | 2012-03-28 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | Set proper rendered_format when doing render :inline | Santiago Pastorino | 2012-03-28 | 1 | -2/+2 | |
| |/ / / | | | | | | | | | | Closes #5632 | |||||
| * | | | Cover one more case in auth_token and remote forms | Piotr Sarnacki | 2012-03-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it. | |||||
| * | | | config.action_view.embed_authenticity_token_in_remote_forms is true by default | Piotr Sarnacki | 2012-03-28 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | Changed default value for `config.action_view.embed_authenticity_token_in_remote_forms` to `false`. This change breaks remote forms that need to work also without javascript, so if you need such behavior, you can either set it to `true` or explicitly pass `:authenticity_token => true` in form options | |||||
| * | | | Added config.action_view.embed_authenticity_token_in_remote_forms | Piotr Sarnacki | 2012-03-28 | 2 | -8/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a regression introduced in 16ee611fa, which breaks remote forms that should also work without javascript. This commit introduces config option that allows to configure this behavior defaulting to the old behavior (ie. include authenticity token in remote forms by default) Conflicts: actionpack/CHANGELOG.md | |||||
| * | | | Merge pull request #5621 from rafaelfranca/fix-2492-master | Jeremy Kemper | 2012-03-27 | 1 | -3/+3 | |
| |\ \ \ | | | | | | | | | Fix label_tag to merge the options hash with the object hash | |||||
| | * | | | Check if the options hash already exists and merge it with the another | Rafael Mendonça França | 2012-03-27 | 2 | -12/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | hash. Closes #2492 and #5615 | |||||
| | * | | | Fixing issue #2492 for master branch. ActionView::Base.field_error_proc ↵ | Andrey Samsonov | 2012-03-27 | 1 | -2/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doesn't call for label. objectify_options method should be applied to the proper options arg. See explanation and example of the bug - https://github.com/kryzhovnik/rails_field_error_proc_bug_example | |||||
| * | | | | Merge pull request #5620 from jcoleman/textarea-newline-fix-breaks-haml-master | Santiago Pastorino | 2012-03-27 | 2 | -2/+6 | |
| |\ \ \ \ | | | | | | | | | | | Don't break Haml with textarea newline fix. (master) | |||||
| | * | | | | Don't break Haml with textarea newline fix. | James Coleman | 2012-03-27 | 2 | -2/+6 | |
| | | |/ / | |/| | | | | | | | | | | | | | | | | | | See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.) Also fix 6 more tests that didn't yet have the newline expectation. | |||||
| * / | | | adds delegetion for eof? to AD::Http::UploadedFile | Jens Fahnenbruck | 2012-03-27 | 1 | -1/+1 | |
| |/ / / | | | | | | | | | | | | | if you want to read the file you may need to ask if there is something to read from | |||||
| * | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-27 | 3 | -2/+21 | |
| |\ \ \ | |/ / |/| | | ||||||
| | * | | add missing do [ci skip] | Vijay Dev | 2012-03-27 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Proc objects for caches_page no need controller object | Alexey Vakhov | 2012-03-27 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | added shallow_prefix option description in documantation | Lukasz Sarnacki | 2012-03-27 | 1 | -0/+19 | |
| | | | | | | | | | | | | | It is in response for confusion in issue #5301 | |||||
| | * | | Fix AC actions caching comment | Alexey Vakhov | 2012-03-24 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | If partial is rendered in controller, grab format from template | Piotr Sarnacki | 2012-03-27 | 1 | -2/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously `rendered_format` was set only based on mime types passed in Accept header, which was wrong if first type from Accept was different than rendered partial. The fix is to simply move setting rendered_format to the place where template is available and grab format from the template. If it fails we can fallback to formats passed by Accept header. | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |