aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Evented notifications take priority over Timed notificationsEric Saxby2012-08-112-3/+23
| | | | | | | In cases where a notification subscriber includes methods to support both Evented and Timed events, Evented should take priority over Timed. This allows subscribers to be backwards compatible (older Rails only allows Timed events) while defaulting to newer behavior.
* 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).
* Refactor model name logic and make it a real private class methodCarlos Antonio da Silva2012-08-111-5/+8
| | | | | | | Under a "private" call, class methods are not real private methods, they're public just like any other method. Make model_name_from_record_or_class a private class method, and nodoc it.
* Sync CHANGELOGs [ci skip]Rafael Mendonça França2012-08-115-33/+231
|
* Add CHANGELOG entry for #7314Rafael Mendonça França2012-08-111-0/+5
|
* Merge pull request #7331 from ↵Vijay Dev2012-08-111-0/+3
|\ | | | | | | | | morgoth/changelog-for-engine-table-name-prefix-generator-fix Added changelog entry for table name prefix fix [ci skip]
| * Added changelog entry for table name prefix fix [ci skip]Wojciech Wnętrzak2012-08-111-0/+3
|/
* [guides] Add info about CHANGELOGs to contributing guidePiotr Sarnacki2012-08-111-0/+25
|
* Merge branch 'number-helpers-defaults'Carlos Antonio da Silva2012-08-116-36/+191
|\ | | | | | | Closes #6290
| * Ensure I18n format values always have precedence over defaultsCarlos Antonio da Silva2012-08-113-43/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always merge I18n format values, namespaced or not, over the default ones, to ensure I18n format defaults will have precedence over our namespaced values. Precedence should happen like this: default :format default :namespace :format i18n :format i18n :namespace :format Because we cannot allow our namespaced default to override a I18n :format config - ie precision in I18n :format should always have higher precedence than our default precision for a particular :namespace. Also simplify default format options logic.
| * Fallback to :en locale instead of handling a constant with defaultsCarlos Antonio da Silva2012-08-116-28/+179
|/ | | | | | | | Action Pack already comes with a default locale fine for :en, that is always loaded. We can just fallback to this locale for defaults, if values for the current locale cannot be found. Closes #4420, #2802, #2890.
* Bring back changelog entries for Active SupportCarlos Antonio da Silva2012-08-112-2/+20
| | | | Removed in 0228a73b1094a3e19ad291d2ce4789890c09578a, pull request #7310.
* 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-103-5/+11
|\ \ | | | | | | Move AD default_headers configurations to railtie
| * | Add doc for config.action_dispatch.default_headersGuillermo Iguaran2012-08-101-0/+6
| | | | | | | | | | | | | | | Add documentation for config.action_dispatch.default_headers to Rails Configuring guide.
| * | Move AD default_headers configurations to railtieGuillermo Iguaran2012-08-102-5/+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.
* | fixup guides in light of :dependent changesJon Leighton2012-08-103-15/+19
| |
* | Use method compilation for association methodsJon Leighton2012-08-1012-89/+86
| | | | | | | | | | | | | | | | | | Method compilation provides better performance and I think the code comes out cleaner as well. A knock on effect is that methods that get redefined produce warnings. I think this is a good thing. I had to deal with a bunch of warnings coming from our tests, though.
* | Fix handling SCRIPT_NAME from within mounted engine'sPiotr Sarnacki2012-08-117-41/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | remove some artifacts of dependent_restrict_raises that I missedJon Leighton2012-08-102-2/+0
| | |
* | | DRY up handling of dependent optionJon Leighton2012-08-105-63/+22
| | |
* | | Unprivatise all the thingsJon Leighton2012-08-107-170/+156
| | | | | | | | | | | | | | | | | | Well, not all of them, but some of them. I don't think there's much reason for these methods to be private.
* | | move dependency logic out of generated methodsJon Leighton2012-08-107-65/+64
| | |
* | | Clean up dependent option validation.Jon Leighton2012-08-104-14/+7
| | | | | | | | | | | | | | | We don't need the complexity of to_sentence, and it shouldn't be a bang method.
* | | Remove the dependent_restrict_raises option.Jon Leighton2012-08-1012-141/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not really a good idea to have this as a global config option. We should allow people to specify the behaviour per association. There will now be two new values: * :dependent => :restrict_with_exception implements the current behaviour of :restrict. :restrict itself is deprecated in favour of :restrict_with_exception. * :dependent => :restrict_with_error implements the new behaviour - it adds an error to the owner if there are dependent records present See #4727 for the original discussion of this.
* | | Merge pull request #7286 from kennyj/fix_7191Rafael Mendonça França2012-08-102-13/+28
|\ \ \ | | | | | | | | Fix #7191. Remove unnecessary transaction when assigning has_one associations.
| * | | Fix #7191. Remove unnecessary transaction when assigning has_one associations.kennyj2012-08-082-13/+28
| | | |
* | | | Add 'X-Frame-Options' => 'SAMEORIGIN' and 'X-XSS-Protection' => '1; ↵Santiago Pastorino2012-08-101-0/+6
| | | | | | | | | | | | | | | | mode=block' CHANGELOG entry
* | | | Merge pull request #7315 from brainopia/fix_assertionAaron Patterson2012-08-091-1/+1
|\ \ \ \ | |_|_|/ |/| | | Fix mistake in assertion about content of permanent cookie
| * | | 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
| | |
* | | Merge pull request #7310 from amerine/masterSantiago Pastorino2012-08-091-8/+1
|\ \ \ | | | | | | | | Add html_escape note to CHANGELOG
| * | | Add html_escape note to CHANGELOGMark Turner2012-08-091-8/+1
|/ / /
* | | 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-094-0/+38
|\ \ \ | | | | | | | | Introduce default_headers. closes #6311 #6515
| * | | some testsEgor Homakov2012-08-091-0/+27
| | | |
| * | | introduce default_headers configEgor Homakov2012-08-093-0/+11
| | |/ | |/|
* | | initialize instance variablesAaron Patterson2012-08-093-0/+22
| | |
* | | use a sized buffer to prevent the queue being too largeAaron Patterson2012-08-081-10/+10
|/ /
* | Merge pull request #7293 from ↵Aaron Patterson2012-08-081-5/+3
|\ \ | | | | | | | | | | | | Bertg/activemodel_naming_helpers_try_model_name_first Naming helpers should first check if passed object responds to model_name
| * | Naming helpers should first check if passed object responds to model_nameBert Goethals2012-08-081-5/+3
| | |
* | | Merge pull request #7294 from ↵Rafael Mendonça França2012-08-081-1/+1
|\ \ \ | | | | | | | | | | | | | | | | stevecj/fix-psql-reconnect-after-simulated-disconnect-test Fix only-once stub logic.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 19:44:30 +0000