aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | 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.
| * | | | | | Fix only-once stub logic.Steve Jorgensen2012-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Didn't fail the test because adapter#query happens to not call raw connection's #query, but don't want to count on that and have a fragile test.
* | | | | | | Remove highly uncommon option for moving the manifest pathDavid Heinemeier Hansson2012-08-081-3/+0
| | | | | | |
* | | | | | | Allow data attributes to be set as a first-level option for form_for, so you ↵David Heinemeier Hansson2012-08-083-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | can write `form_for @record, data: { behavior: 'autosave' }` instead of `form_for @record, html: { data: { behavior: 'autosave' } }` *DHH*
* | | | | | | Merge pull request #7292 from ↵Rafael Mendonça França2012-08-081-8/+9
|\| | | | | | | |/ / / / / |/| | | | | | | | | | | | | | | | | stevecj/fix-psql-reconnect-after-simulated-disconnect-test Fix just-plain-wrongness of psql auto-reconnect test.
| * | | | | Fix just-plain-wrongness of psql auto-reconnect test.Steve Jorgensen2012-08-071-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Full test requiring manual intervention was fine, but w/ simulated disconnect, assertion was backward & still passing. Was several kinds of wrong.
* | | | | | 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-073-2/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Remove antiquated example codeDavid Heinemeier Hansson2012-08-079-219/+0
| | | | | |
* | | | | | Remove outdated examples and feature highlightsDavid Heinemeier Hansson2012-08-071-285/+0
| | | | | |
* | | | | | Observers are no longer important enough to get this configuration option ↵David Heinemeier Hansson2012-08-071-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | called out at the top level
* | | | | | Add back missing requireRafael Mendonça França2012-08-071-0/+1
| | | | | |
* | | | | | Fix the deprecation horizon. [ci skip]Rafael Mendonça França2012-08-071-1/+1
| | | | | |
* | | | | | Deprecate ActiveSupport::JSON::VariableErich Menge2012-08-073-0/+27
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: ActiveSupport::JSON::Variable is not used anymore internally. It was deprecated in 3-2-stable but we reverted all the deprecation for point releases. See #6536 and #6546. Conflicts: activesupport/lib/active_support/json/variable.rb
* / / / / make assertions easier to track downAaron Patterson2012-08-071-9/+17
|/ / / /
* | | | Revert "Merge pull request #7202 from asanghi/perform_deliveries_in_mail"José Valim2012-08-074-23/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reverting because it feels backward to specify a delivery to not be performed while the e-mail is being composed. It is simpler (and makes more sense) to delegate the responsibility to the calling code.
* | | | Revert "Merge pull request #7033 from kron4eg/master". Not a a fan at all of ↵David Heinemeier Hansson2012-08-073-76/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | what this makes ERB files look like. This reverts commit 46b8bceedd3e47169c50a04c93161424909c75fb, reversing changes made to 2f58795e783150f2e1b1f6c64e305703f0061129.
* | | | Revert "The application generator generates `public/humans.txt` with some ↵David Heinemeier Hansson2012-08-073-14/+0
| | | | | | | | | | | | | | | | basic data". I dont consider this something most people is going to want most of the time. If you want to add it in your own app, knock yourself out. But it doesnt belong in Rails imo
* | | | Merge pull request #7033 from kron4eg/masterSantiago Pastorino2012-08-073-4/+76
|\ \ \ \ | | | | | | | | | | Restore "%" ERb/Erubis Trim Mode
| * | | | Restoring the '%' trim mode for ERb templates, allowing for a leading ↵Artiom Di2012-08-073-4/+76
| | | | | | | | | | | | | | | | | | | | percent sign on a line to indicate non-inserted Ruby code.
* | | | | defines String#indent [closes #7263] [Xavier Noria & Ace Suares]Xavier Noria2012-08-075-0/+137
|/ / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-30 06:42:48 +0000