Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3780 from marcbowes/master | Vijay Dev | 2011-12-16 | 1 | -7/+3 |
|\ | | | | | Fix favicon_link_tag help text | ||||
| * | * A `/` is required if you want to explicitly skip the assets directory. ↵ | Marc Bowes | 2011-11-28 | 1 | -7/+3 |
| | | | | | | | | | | This is important because `public/assets` is typically git-ignored. * The asset id is no longer generated. | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-12-16 | 1 | -3/+3 |
|\ \ | |||||
| * | | escape assigns[:person], assigns[person] etc in actioncontroller testcase | Nick Howard | 2011-12-14 | 1 | -3/+3 |
| | | | |||||
* | | | Show detailed exceptions no longer returns true if the request is local in ↵ | José Valim | 2011-12-16 | 1 | -1/+9 |
| | | | | | | | | | | | | production. | ||||
* | | | Do not raise an exception if an invalid route was generated automatically. | José Valim | 2011-12-16 | 1 | -3/+11 |
| | | | |||||
* | | | ShowExceptions should understand X-Cascade responses from exceptions app. | José Valim | 2011-12-16 | 3 | -6/+16 |
| | | | |||||
* | | | Improve the specs on exceptions app. | José Valim | 2011-12-16 | 1 | -1/+6 |
| | | | |||||
* | | | Extract the rendering of public exceptions pages into a Rack app. | José Valim | 2011-12-16 | 3 | -33/+49 |
| | | | |||||
* | | | Get rid of the close checks since we cannot reliably close the session anyway. | José Valim | 2011-12-16 | 5 | -28/+0 |
| | | | |||||
* | | | Fix diagnostics page for routing errors. | José Valim | 2011-12-15 | 2 | -9/+2 |
| | | | |||||
* | | | Remove autoload for non-existent file. | Uģis Ozols | 2011-12-15 | 1 | -1/+0 |
| | | | |||||
* | | | fix separator insertion in date_select helper | Sergey Nartimov | 2011-12-14 | 1 | -1/+2 |
| | | | |||||
* | | | Close the response body on cascade pass, closes #3975. | José Valim | 2011-12-14 | 1 | -0/+2 |
| | | | |||||
* | | | Fix url_for options[:subdomain] to allow objects as values | choonkeat | 2011-12-14 | 1 | -1/+1 |
| | | | | | | | | | | | | * e.g. blog_url(subdomain: current_user) instead of blog_url(subdomain: current_user.to_param) | ||||
* | | | Clean up details keys before some tests to expire the cache. | José Valim | 2011-12-14 | 1 | -0/+4 |
| | | | |||||
* | | | dup the details hash if a key has already been set for this object | Aaron Patterson | 2011-12-13 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #3970 from lest/backtrace-when-silenced | José Valim | 2011-12-13 | 1 | -1/+4 |
|\ \ | | | | | | | log exception backtrace when all backtrace lines silenced | ||||
| * | | log exception backtrace when all backtrace lines silenced | Sergey Nartimov | 2011-12-13 | 1 | -1/+4 |
| | | | |||||
* | | | locale and default_locale may be the same, so uniq the array | Aaron Patterson | 2011-12-13 | 1 | -1/+1 |
| | | | |||||
* | | | stop freezing the details hash | Aaron Patterson | 2011-12-13 | 1 | -2/+1 |
| | | | |||||
* | | | stop freezing hash value | Aaron Patterson | 2011-12-13 | 1 | -1/+1 |
|/ / | |||||
* | | use Array#join so that file encoding doesn't impact returned string. | Aaron Patterson | 2011-12-12 | 1 | -3/+3 |
| | | | | | | | | Fixes #3957 | ||||
* | | logger adds a newline for us | Aaron Patterson | 2011-12-12 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #3943 from sferik/add_explicit_requires | José Valim | 2011-12-12 | 2 | -2/+1 |
|\ \ | | | | | | | Include TagHelper but don't explicitly require it | ||||
| * | | Include TagHelper but don't explicitly require it | Erik Michaels-Ober | 2011-12-12 | 2 | -2/+1 |
| | | | | | | | | | | | | Allow autoloading to work as intended and avoid multiple requires. | ||||
* | | | Allow reloader to be configured. | José Valim | 2011-12-12 | 1 | -14/+38 |
| | | | |||||
* | | | Default relative_url_root to ENV["RAILS_RELATIVE_URL_ROOT"]. Fixes #3365 | Piotrek Okoński | 2011-12-12 | 2 | -1/+2 |
|/ / | |||||
* | | Added :use_two_digit_numbers option [Lennart Fridén & Kim Persson] | Lennart Fridén | 2011-12-11 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | Added use_two_digit_numbers select_tag option for displaying months and days with leading zeros without affecting the values (useful for e.g. ISO-style dates, 2011-08-01). Signed-off-by: José Valim <jose.valim@gmail.com> Conflicts: actionpack/CHANGELOG.md | ||||
* | | Merge pull request #3933 from wfarr/master | José Valim | 2011-12-11 | 2 | -0/+39 |
|\ \ | | | | | | | Add button_tag support to ActionView::Helpers::FormBuilder | ||||
| * | | Add button_tag support to ActionView::Helpers::FormBuilder. | Will Farrington | 2011-12-11 | 2 | -0/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This support is near-identical to the existing submit_tag support. Example: <%= form_for @post do |f| %> <%= f.button %> <% end %> | ||||
* | | | Use ProcessedAsset#pathname in Sprockets helpers when debugging is on. ↵ | Guillermo Iguaran | 2011-12-10 | 1 | -3/+3 |
|/ / | | | | | | | | | | | Closes #3333 #3348 #3361. Is wrong use ProcessedAsset#to_s since it returns the content of the file. | ||||
* | | Update partials documentation, partial_path is no longer generated using ↵ | Piotr Sarnacki | 2011-12-10 | 1 | -10/+13 |
| | | | | | | | | RecordIdentifier | ||||
* | | Fix extend -> include. | José Valim | 2011-12-09 | 2 | -3/+1 |
| | | |||||
* | | Make ActiveSupport::Benchmarkable a default module for ↵ | David Heinemeier Hansson | 2011-12-09 | 1 | -0/+2 |
| | | | | | | | | ActionController::Base, so the #benchmark method is once again available in the controller context like it used to be *DHH* | ||||
* | | Deprecate implicit layout lookup in favor of inheriting the _layout config. | José Valim | 2011-12-09 | 1 | -32/+86 |
| | | |||||
* | | Simplify path traversal logic | José Valim | 2011-12-09 | 1 | -7/+7 |
| | | |||||
* | | load the encoding converter to work around [ruby-core:41556] when switching ↵ | Aaron Patterson | 2011-12-08 | 2 | -115/+0 |
| | | | | | | | | encodings | ||||
* | | Fix another regression related to the layout optimization. | José Valim | 2011-12-08 | 1 | -0/+2 |
| | | |||||
* | | Move symbolize keys to the inner options as we can assume url_options will ↵ | José Valim | 2011-12-08 | 2 | -2/+2 |
| | | | | | | | | be properly symbolized. | ||||
* | | Fix a regression and also fix broken test. | José Valim | 2011-12-08 | 1 | -4/+9 |
| | | |||||
* | | Improve cache on route_key lookup. | José Valim | 2011-12-08 | 1 | -4/+6 |
| | | |||||
* | | Revert accidental change from cattr_accessor to class_attribute. | José Valim | 2011-12-08 | 1 | -1/+1 |
| | | |||||
* | | Just use the proc if there is a chance of layout lookup. | José Valim | 2011-12-08 | 1 | -5/+6 |
| | | |||||
* | | Optimize layout lookup to avoid double calls. | José Valim | 2011-12-08 | 4 | -33/+41 |
| | | |||||
* | | Some small optimizations and improvements to benchmark code. | José Valim | 2011-12-08 | 3 | -16/+11 |
| | | |||||
* | | Merge pull request #3900 from jfturcot/accessible_wrap_params | José Valim | 2011-12-08 | 1 | -1/+8 |
|\ \ | | | | | | | ParamsWrapper only wrap the accessible attributes when they were set | ||||
| * | | ParamsWrapper only wrap the accessible attributes when they were set | Jean-Francois Turcot | 2011-12-07 | 1 | -1/+8 |
| | | | |||||
* | | | Remove dead broken code from AD::Request | José Valim | 2011-12-08 | 1 | -8/+0 |
| | | | |||||
* | | | Merge pull request #3888 from kennyj/should_use_default_charset | José Valim | 2011-12-08 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Assign config.encoding to AD::Response.default_charset at the initialization time. |