aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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.
* | | | Add CHANGELOG entry for #7410Rafael Mendonça França2012-08-211-0/+5
| | | |
* | | | option_tags coerced to "" instead of nilSandeep2012-08-212-0/+13
| | | |
* | | | 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-202-2/+12
| | | | |
* | | | | Access @rs only through attr_accessortomykaira2012-08-201-11/+11
|/ / / /
* | / / Added X-Content-Type-Options to the header defaults.Jim Jones2012-08-183-4/+8
| |/ / |/| | | | | | | | With a value of "nosniff", this prevents Internet Explorer from MIME-sniffing a response away from the declared content-type.
* | | Fix slightly broken Markdown syntax in actionpack/CHANGELOG.mdhollowspace2012-08-171-10/+10
| | |
* | | 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-153-2/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-133-2/+24
| | | |
* | | | Add Request#formats=(extensions) that lets you set multiple formats directly ↵David Heinemeier Hansson2012-08-142-1/+36
| | | | | | | | | | | | | | | | in a prioritized order
* | | | Add CHANGELOG entry and documentation for Routing ConcernsRafael Mendonça França2012-08-132-0/+68
| | | |
* | | | Extract common controllers to abstract_unitRafael Mendonça França2012-08-133-45/+33
| | | |
* | | | Implementing Routing ConcernsRafael Mendonça França2012-08-132-1/+117
|/ / / | | | | | | | | | | | | | | | | | | 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-133-8/+22
| | | | | | | | | | | | their own header object
* | | live response headers can be merged with a hashAaron Patterson2012-08-132-0/+10
| | |
* | | Add support for start_hour and end_hour options in select_hour helperEvan Tann2012-08-133-1/+42
| | | | | | | | | | | | 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-112-1/+10
| | | | | | | | | | | | We can avoid creating extra hashes with #merge, and use #merge! instead.
* | | Simplify html attributes generation for options_for_selectCarlos Antonio da Silva2012-08-112-8/+11
| | | | | | | | | | | | | | | | | | | | | 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).
* | | Sync CHANGELOGs [ci skip]Rafael Mendonça França2012-08-111-30/+91
| | |
* | | Add CHANGELOG entry for #7314Rafael Mendonça França2012-08-111-0/+5
| | |
* | | Merge pull request #7314 from schneems/schneems/form_for_errorRafael Mendonça França2012-08-102-0/+15
|\ \ \ | | | | | | | | Check for Blank Record in form_for
| * | | check for nil or empty record in form_forschneems2012-08-102-0/+15
| | | | | | | | | | | | | | | | 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-113-25/+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.
* | | | | Add 'X-Frame-Options' => 'SAMEORIGIN' and 'X-XSS-Protection' => '1; ↵Santiago Pastorino2012-08-101-0/+6
| | | | | | | | | | | | | | | | | | | | mode=block' CHANGELOG entry
* | | | | Test actual content of permanent cookiebrainopia2012-08-101-1/+1
| |/ / / |/| | |
* | | | set the controller under test so we no longer need the reset! methodAaron Patterson2012-08-091-38/+4
| | | |
* | | | Do not mark strip_tags result as html_safeSantiago Pastorino2012-08-092-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Thanks to Marek Labos & Nethemba CVE-2012-3465
* | | | push drawing once to it's own moduleAaron Patterson2012-08-091-32/+20
| | | |
* | | | refactor the before_setup hooks to a moduleAaron Patterson2012-08-091-13/+12
| | | |
* | | | switch callbacks to minitest hooksAaron Patterson2012-08-091-3/+6
| | | |
* | | | Merge pull request #7302 from homakov/default_headersAaron Patterson2012-08-093-0/+33
|\ \ \ \ | | | | | | | | | | Introduce default_headers. closes #6311 #6515
| * | | | some testsEgor Homakov2012-08-091-0/+27
| | | | |
| * | | | introduce default_headers configEgor Homakov2012-08-092-0/+6
| |/ / /
* | | | initialize instance variablesAaron Patterson2012-08-093-0/+22
| | | |