aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Fixed issue where routes with globs caused constraints on that glob toMaura Fitzgerald2012-12-043-1/+34
| | | | | | be ignored. A regular expression constraint gets overwritten when the routes.rb file is processed. Changed the overwriting to an ||= instead of an = assignment.
* Override <%== to always behave as literal text rather than toggling based on ↵Jeremy Kemper2012-12-033-4/+21
| | | | whether escaping is enabled. Fixes that existing plaintext email templates using <%== unexpectedly flipped to *escaping* HTML when #8235 was merged.
* More descriptive error when rendering a partial with `:layout => true`Yves Senn2012-12-023-1/+16
|
* hash filters should be accessed with symbols or stringsFrancesco Rodriguez2012-11-302-3/+30
|
* Merge pull request #8363 from ↵Carlos Antonio da Silva2012-11-291-3/+9
|\ | | | | | | | | Takehiro-Adachi/add-string-options-examples-to-currentpage-method Added examples to current_page? method [ci skip]
| * added examples when options is stringTakehiro Adachi2012-11-291-3/+9
| |
* | Add CHANGELOG entries for the observes extractionRafael Mendonça França2012-11-291-0/+4
|/ | | | [ci skip]
* Remove observers and sweepersRafael Mendonça França2012-11-285-179/+2
| | | | | | | | They was extracted from a plugin. See https://github.com/rails/rails-observers [Rafael Mendonça França + Steve Klabnik]
* Merge pull request #8318 from Empact/fixture-fileRafael Mendonça França2012-11-272-5/+19
|\ | | | | Use File.join to better integrate fixture_path in fixture_file_upload.
| * Use File.join to better integrate fixture_path in fixture_file_upload.Ben Woosley2012-11-262-5/+19
| |
* | Cleanup CacheHelper changes allowing opt-out of cache digestsDrew Ulmer2012-11-271-2/+2
| | | | | | | | | | | | | | | | | | | | Instead of deleting the skip_digest option flag, this changes the method to merely check the key. This change is because of a discussion in this thread: https://github.com/rails/rails/pull/8317 This commit also makes #fragment_name_with_digest private due to its functionality being subsumed by #cache_fragment_name.
* | Add CHANGELOG entry for opt-out option of automatic template digestingDrew Ulmer2012-11-271-0/+8
| |
* | No sort Hash options in #grouped_options_for_selectSergey Kojin2012-11-273-7/+7
| |
* | Fix Strong Parameters docs.Uģis Ozols2012-11-271-2/+1
| | | | | | | | | | It's only possible to inherit from ActiveRecord::Base and not include it.
* | unshift html-scanner into $LOAD_PATH rather than appendAkira Matsuda2012-11-271-1/+1
| |
* | Remove warning of circular requireRafael Mendonça França2012-11-271-1/+1
| | | | | | | | | | | | | | | | | | This file was using mime_types before load the Mime::Type class. When trying to register first Mime::Type it load mime_type that loads mime_types in the end. Requiring mime_type ensure that we have the class definition and the mime types
* | Accept symbols as #send_data :disposition valueElia Schito2012-11-273-0/+15
| |
* | @steveklabnik can't spell 'distance.'Steve Klabnik2012-11-261-1/+1
| |
* | Add changelog for #7997.Steve Klabnik2012-11-261-0/+2
| | | | | | | | This was forgotten when we did the merge.
* | Improve clarity of routing testsAndrew White2012-11-261-634/+1081
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the routes for each test inside the test method so that it's easier to see which routes are applicable to which test. To ensure that each test wasn't invalidated the changes were done by first removing all of the routes, ensuring that all of the tests failed and then adding the routes back to each test one by one. One test for `assert_recognizes` was removed as it wasn't actually testing the defined routes and is now tested more thoroughly in routing_assertions_test.rb. One downside is that the test suite takes about 1s longer due to having to using `method_missing` for handling the url helpers as using `include url_helpers` isn't isolated for each test.
* | Merge pull request #8316 from roberto/assert_template_validate_optionsCarlos Antonio da Silva2012-11-263-1/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | assert_template: validating option keys It only handles the keys locals, partial, layout and count. assert_template(foo: "bar") # raises ArgumentError assert_template(leiaute: "test") # raises ArgumentError
| * | assert_template: validating option keysRoberto Soares2012-11-253-1/+11
| | |
* | | Merge pull request #8317 from latortuga/cache-digest-opt-outDavid Heinemeier Hansson2012-11-263-1/+38
|\ \ \ | |/ / |/| | Add explicit opt-out for fragment cache digesting
| * | Add explicit opt-out for fragment cache digestingDrew Ulmer2012-11-253-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | This add support for sending an explicit opt-out of the "Russian-doll" cache digest feature on a case-by-case basis. This is useful when cache- expiration needs to be performed manually and it would be otherwise difficult to know the exact name of a digested cache key. More information: https://github.com/rails/cache_digests/pull/16
* | | Merge pull request #8302 from roberto/assert_template_empty_stringCarlos Antonio da Silva2012-11-253-1/+19
|\ \ \ | |/ / |/| | assert_template("") will now fail no matter whether a template has been rendered or not.
| * | `assert_template` fails with empty string.Roberto Soares2012-11-233-9/+12
| | |
| * | `assert_template` fails with empty string when a template has been renderedRoberto Soares2012-11-233-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | For instance, it prevents false positive in this case: file = nil get :index assert_template("#{file}")
* | | Merge pull request #8306 from senny/documentation_for_hidden_field_idCarlos Antonio da Silva2012-11-241-0/+5
|\ \ \ | |_|/ |/| | Document :hidden_field_id option for fields_for [ci skip]
| * | document :hidden_field_id option for fields_forYves Senn2012-11-241-0/+5
| | |
* | | Refector a bit to remove extra slice iteration and splat callCarlos Antonio da Silva2012-11-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This yields a small bit of performance improvement when building the defaults from constraints, specially considering that it's rather common for constraints to be empty. Also, there's a bit of duplicated code in here that I have to check before extracting.
* | | Use merge! in some places to avoid creating extra hashesCarlos Antonio da Silva2012-11-242-4/+4
| | |
* | | Simplify scope options recovery by using merge!Carlos Antonio da Silva2012-11-241-6/+1
| | | | | | | | | | | | | | | | | | Instead of iterating again over the options and setting one by one, we can just merge the recover hash back to the scope one since all keys match.
* | | Normalize scope recovering :blocks option nameCarlos Antonio da Silva2012-11-241-3/+3
| | | | | | | | | | | | | | | Use the same :blocks key in the recover hash to revert the scope options later.
* | | Simplify constraints condition in scope when checking for HashCarlos Antonio da Silva2012-11-241-7/+4
| |/ |/|
* | Indent changelog markdown code to highlight correctlyCarlos Antonio da Silva2012-11-221-11/+11
| | | | | | | | [ci skip]
* | Allow setting a symbol as path in scope on routesGuillermo Iguaran2012-11-213-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was surprising found that this example doesn't work: scope :api do resources :users end and the right form to use it is: scope 'api' do resources :users end I think this should work similary as `namespace` where both are allowed. These two are equivalent: namespace :api do resources :users end namespace 'api' do resources :user end
* | Remove private partial/template renderer methodsCarlos Antonio da Silva2012-11-213-14/+3
| | | | | | | | | | | | Since now these objects are not cached anymore, there's no need to have these private methods, just instantiate each of them in the necessary place.
* | Merge pull request #8183 from jcoglan/objectless_sessionsJon Leighton2012-11-213-11/+47
|\ \ | | | | | | Store FlashHashes in the session as plain hashes
| * | Store FlashHashes in the session as plain hashes rather than custom objects ↵James Coglan2012-11-093-11/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with unstable class names and instance variables. Refactor FlashHash to take values for its ivars in the constructor, to pretty up FlashHash.from_session_value. Remove stale comment on FlashHash: it is no longer Marshaled in the session so we can change its implementation. Remove blank lines I introduced in controller/test_case.rb. Unit tests for FlashHash#to_session_value. Put in a compatibility layer to accept FlashHash serializations from Rails 3.0+. Test that Rails 3.2 session flashes are correctly converted to the new format. Remove code path for processing Rails 3.0 FlashHashes since they can no longer deserialize. Fix session['flash'] deletion condition: it will never be empty?, it will either be nil or a hash with 'discard' and 'flashes' keys.
* | | Correct the use of params options when given to url_forCarlos Antonio da Silva2012-11-193-10/+16
| | | | | | | | | | | | Merge url for tests and add changelog entry for #8233.
* | | Fix issue with params in url_fortumayun2012-11-192-1/+9
| | | | | | | | | | | | | | | | | | With a "params" argument, the following error is raised: undefined method `reject!` for "":String
* | | Refactor request tests, remove #with_set methodCarlos Antonio da Silva2012-11-191-8/+3
| |/ |/|
* | render every partial with a new `PartialRenderer`.Yves Senn2012-11-193-2/+18
| | | | | | | | | | | | | | | | This resolves issues when rendering nested partials. Previously the `PartialRenderer` was reused which led to situations where the state of the renderer was reset. Closes #8197
* | Fix UpgradeSignatureToEncryptionCookieStore docSantiago Pastorino2012-11-191-9/+4
| |
* | Removed extra call to #diff in #assert_recognizes. assert_equal calls it for ↵Ryan Davis2012-11-171-4/+7
| | | | | | | | you and shows the diff. Also delayed message calculation so the cost of the diff on success is now gone.
* | Improve UpgradeSignatureToEncryptionCookieStore docsSantiago Pastorino2012-11-161-1/+14
| | | | | | | | | | I suck at English, please help me reviewing this <3 <3 <3 [ci skip]
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-11-172-20/+25
|\ \ | | | | | | | | | | | | Conflicts: actionpack/lib/action_dispatch/routing/redirection.rb
| * | update syntax and add note about prompt use of HttpHelpers [ci-skip]Cesar Carruitero2012-11-091-12/+17
| | |
| * | correct link syntax [ci-skip]Cesar Carruitero2012-11-091-5/+5
| | |
| * | change rdoc syntax for adecuate render [ci-skip]Cesar Carruitero2012-11-091-1/+1
| | |