aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Remove dependency on actionpack in ActionView::AssetPathsPiotr Sarnacki2012-08-284-6/+20
|/ / / / | | | | | | | | | | | | | | | | | | | | Since Action View should not depend on actionpack, it's best to delegate invalid_asset_host! to controller and just rely on such simple contract instead of raising ActionController::RoutingError directly.
* | | | correct handling of date selects when using both disabled and discard optionsVasiliy Ermolovich2012-08-251-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we should take disabled option not only from `html_options` hash but from `options` hash too like `build_select` method does it. So datetime_select("post", "updated_at", { :discard_minute => true }, { :disabled => true }) datetime_select("post", "updated_at", :discard_minute => true , :disabled => true) both these variants work now closes #7431
* | | | Extract ActiveRecord::SessionStore from RailsPrem Sichanugrist2012-08-241-9/+0
| |_|/ |/| | | | | | | | | | | This functionality will be available from gem `active_record-session_store` instead.
* | | copy edit the time_ago_in_words helper docsVijay Dev2012-08-231-4/+4
| | |
* | | Merge pull request #7398 from iamvery/time_ago_in_words-docsVijay Dev2012-08-221-0/+7
|\ \ \ | |/ / |/| | Extended documentation for `time_ago_in_words` helper
| * | Extended documentation for `time_ago_in_words` helperJay Hayes2012-08-201-0/+7
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-08-221-4/+4
|\ \ \
| * | | Make a doc example output in match actual outputEvan Farrar2012-08-151-4/+4
| | | | | | | | | | | | | | | | | | | | Make doc output in grouped_options_for_select divider example match actual output. The options groups were in backwards order of actual.
* | | | Get rid of config.preload_frameworks in favor of config.eager_load_namespacesJosé Valim2012-08-216-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The new option allows any Ruby namespace to be registered and set up for eager load. We are effectively exposing the structure existing in Rails since v3.0 for all developers in order to make their applications thread-safe and CoW friendly.
* | | | option_tags coerced to "" instead of nilSandeep2012-08-211-0/+1
| | | |
* | | | Merge pull request #7406 from janko-m/documentation_fixesRafael Mendonça França2012-08-212-45/+45
|\ \ \ \ | | | | | | | | | | Fixed some documentation mistakes
| * | | | Fix documentation mistakesJanko Marohnić2012-08-212-45/+45
| | | | |
* | | | | Make sure :via works with mountPratik Naik2012-08-201-2/+3
|/ / / /
* | / / Added X-Content-Type-Options to the header defaults.Jim Jones2012-08-181-1/+2
| |/ / |/| | | | | | | | With a value of "nosniff", this prevents Internet Explorer from MIME-sniffing a response away from the declared content-type.
* | | Remove the active_model require from action_dispatch.Rafael Mendonça França2012-08-161-1/+0
|/ / | | | | | | | | | | | | | | Since we removed the ActiveModel dependenxy from ActionPack at 166dbaa7526a96fdf046f093f25b0a134b277a68 we don't need to require it anymore. Closes #7370
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-08-162-3/+15
|\ \
| * | copy edits [ci skip]Vijay Dev2012-08-161-6/+7
| | |
| * | Minor language fix. [ci skip]Erich Menge2012-08-151-2/+2
| | |
| * | Document the namespacing of controller actions per this discussion:schneems2012-08-091-0/+11
| | | | | | | | | https://github.com/rails/journey/issues/40
* | | Merge pull request #7244 from lucasuyezu/masterCarlos Antonio da Silva2012-08-151-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix indentation on template errors to consider line number character count. For instance, when an error is shown, if the related source code snippet has line numbers from, lets say, 8-12, the lines are left aligned, which means the code indent is wrong: 8: foo 9: bar 10: raise 11: baz 12: ... This changes it to right align the source code snippet, so that the indentation is correct: 8: foo 9: bar 10: raise 11: baz 12: ...
| * | | Indentation should consider line number character count.Lucas Uyezu2012-08-131-2/+2
| | | |
* | | | Add Request#formats=(extensions) that lets you set multiple formats directly ↵David Heinemeier Hansson2012-08-141-0/+21
| | | | | | | | | | | | | | | | in a prioritized order
* | | | Add CHANGELOG entry and documentation for Routing ConcernsRafael Mendonça França2012-08-131-0/+38
| | | |
* | | | Implementing Routing ConcernsRafael Mendonça França2012-08-131-1/+23
|/ / / | | | | | | | | | | | | | | | | | | This pattern was introduced as a plugin by @dhh. The original implementation can be found in https://github.com/rails/routing_concerns
* | | push header merge down to a private method so that live responses can have ↵Aaron Patterson2012-08-132-8/+11
| | | | | | | | | | | | their own header object
* | | live response headers can be merged with a hashAaron Patterson2012-08-131-0/+4
| | |
* | | Add support for start_hour and end_hour options in select_hour helperEvan Tann2012-08-131-1/+11
| | | | | | | | | | | | Updated documentation to demonstrate start_hour and end_hour options
* | | Grammar fix in ActionView docs/commentsEdward Ocampo-Gooding2012-08-121-1/+1
| | |
* | | Missing closing tagEllis Berner2012-08-121-1/+1
| | |
* | | Ensure option_html_attributes does not modify the given option hashesCarlos Antonio da Silva2012-08-111-1/+1
| | | | | | | | | | | | We can avoid creating extra hashes with #merge, and use #merge! instead.
* | | Simplify html attributes generation for options_for_selectCarlos Antonio da Silva2012-08-111-3/+5
| | | | | | | | | | | | | | | | | | | | | Further simplify the option_html_attributes method after the changes introduced in dacbcbe55745aa9e5484b10b11f65ccca7db1c54 to not escape the html options here (since they're going to be escaped down the chain in content tag).
* | | Merge pull request #7314 from schneems/schneems/form_for_errorRafael Mendonça França2012-08-101-0/+1
|\ \ \ | | | | | | | | Check for Blank Record in form_for
| * | | check for nil or empty record in form_forschneems2012-08-101-0/+1
| | | | | | | | | | | | | | | | if nil or an empty array is passed into form_for you get a horrible error message, this one is much more indicative of what the programmer needs to know to fix the problem.
* | | | Merge pull request #7329 from guilleiguaran/move-default-headers-ad-railtieRafael Mendonça França2012-08-101-0/+5
|\ \ \ \ | | | | | | | | | | Move AD default_headers configurations to railtie
| * | | | Move AD default_headers configurations to railtieGuillermo Iguaran2012-08-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionDispatch railtie is a better place for config.action_dispatch.default_headers settings, users can continue overriding those settings in their configuration files if needed.
* | | | | Further refactor build_conditions in route setCarlos Antonio da Silva2012-08-101-5/+3
|/ / / / | | | | | | | | | | | | | | | | Return the conditions from the keep_if call, and ignore the value argument since it's not being used.
* | | | Fix handling SCRIPT_NAME from within mounted engine'sPiotr Sarnacki2012-08-112-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you mount your application at a path, for example /myapp, server should set SCRIPT_NAME to /myapp. With such information, rails application knows that it's mounted at /myapp path and it should generate routes relative to that path. Before this patch, rails handled SCRIPT_NAME correctly only for regular apps, but it failed to do it for mounted engines. The solution was to hardcode default_url_options[:script_name], which is not the best answer - it will work only when application is mounted at a fixed path. This patch fixes the situation by respecting original value of SCRIPT_NAME when generating application's routes from engine and the other way round - when you generate engine's routes from application. This is done by using one of 2 pieces of information in env - current SCRIPT_NAME or SCRIPT_NAME for a corresponding router. This is because we have 2 cases to handle: - generating engine's route from application: in this situation SCRIPT_NAME is basically SCRIPT_NAME set by the server and it indicates the place where application is mounted, so we can just pass it as :original_script_name in url_options. :original_script_name is used because if we use :script_name, router will ignore generating prefix for engine - generating application's route from engine: in this situation we already lost information about the SCRIPT_NAME that server used. For example if application is mounted at /myapp and engine is mounted at /blog, at this point SCRIPT_NAME is equal /myapp/blog. Because of that we need to keep reference to /myapp SCRIPT_NAME by binding it to the current router. Later on we can extract it and use when generating url Please note that starting from now you *should not* use default_url_options[:script_name] explicitly if your server already passes correct SCRIPT_NAME to rack env. (closes #6933)
* | | | Merge pull request #7321 from bogdan/refactor_routes_setSantiago Pastorino2012-08-101-10/+7
|\ \ \ \ | |/ / / |/| | | RouteSet: refactor internals
| * | | RouteSet: refactor internalsBogdan Gusiev2012-08-101-10/+7
| | | | | | | | | | | | | | | | | | | | No need to build valid_conditions array. We can get all the data in place.
* | | | Do not mark strip_tags result as html_safeSantiago Pastorino2012-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Thanks to Marek Labos & Nethemba CVE-2012-3465
* | | | Merge pull request #7302 from homakov/default_headersAaron Patterson2012-08-092-0/+6
|\ \ \ \ | | | | | | | | | | Introduce default_headers. closes #6311 #6515
| * | | | introduce default_headers configEgor Homakov2012-08-092-0/+6
| |/ / /
* | | | initialize instance variablesAaron Patterson2012-08-093-0/+22
| | | |
* | | | use a sized buffer to prevent the queue being too largeAaron Patterson2012-08-081-10/+10
|/ / /
* | | Allow data attributes to be set as a first-level option for form_for, so you ↵David Heinemeier Hansson2012-08-081-0/+19
| | | | | | | | | | | | can write `form_for @record, data: { behavior: 'autosave' }` instead of `form_for @record, html: { data: { behavior: 'autosave' } }` *DHH*
* | | Modernize the documentation for view caching somewhatDavid Heinemeier Hansson2012-08-082-53/+23
| | |
* | | Deprecate `button_to_function` and `link_to_function` helpers.Rafael Mendonça França2012-08-071-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We recommend the use of Unobtrusive JavaScript instead. For example: link_to "Greeting", "#", :class => "nav_link" $(function() { $('.nav_link').click(function() { // Some complex code return false; }); }); or link_to "Greeting", '#', onclick: "alert('Hello world!'); return false", class: "nav_link" for simple cases. This reverts commit 3acdd652e9fe99481c879c84c5807a84eb9ad724.
* | | Revert "Merge pull request #7033 from kron4eg/master". Not a a fan at all of ↵David Heinemeier Hansson2012-08-071-10/+4
| | | | | | | | | | | | | | | | | | | | | what this makes ERB files look like. This reverts commit 46b8bceedd3e47169c50a04c93161424909c75fb, reversing changes made to 2f58795e783150f2e1b1f6c64e305703f0061129.
* | | Restoring the '%' trim mode for ERb templates, allowing for a leading ↵Artiom Di2012-08-071-4/+10
| | | | | | | | | | | | percent sign on a line to indicate non-inserted Ruby code.
* | | Rearrange example output of javascript_include_tagPrem Sichanugrist2012-08-061-2/+2
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 07:54:41 +0000