Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-12-04 | 22 | -283/+232 |
|\ | | | | | | | | | Conflicts: guides/source/migrations.md | ||||
| * | copy edits [ci skip] | Vijay Dev | 2012-12-04 | 4 | -27/+18 |
| | | |||||
| * | Fix a typo in ActionController::Caching | Jean Boussier | 2012-12-03 | 1 | -2/+1 |
| | | |||||
| * | Remove nodoc from FlashHash #[]= [ci skip] | Pablo Torres | 2012-12-01 | 1 | -1/+1 |
| | | |||||
| * | Cleans and removes 'Examples' tag [ci skip] | Alvaro Pereyra | 2012-12-01 | 2 | -4/+0 |
| | | |||||
| * | Cleans and removes useless 'Examples' tag [ci skip] | Alvaro Pereyra | 2012-12-01 | 6 | -62/+44 |
| | | |||||
| * | Add documentation to AssetTagHelper#image_alt [ci skip] | Florent Guilleux | 2012-12-01 | 1 | -0/+3 |
| | | |||||
| * | Fixes wrong typo on FormHelper [ci skip] | Alvaro Pereyra | 2012-12-01 | 1 | -1/+1 |
| | | |||||
| * | Cleans documentation from Helpers [ci skip] | Alvaro Pereyra | 2012-12-01 | 5 | -121/+98 |
| | | |||||
| * | Revert "Remove trailing whitespaces" | Florent Guilleux | 2012-12-01 | 2 | -2/+2 |
| | | | | | | | | This reverts commit 90c887fa7d0c454b7533e208daefc342dea4d5f3. | ||||
| * | Remove trailing whitespaces | Florent Guilleux | 2012-12-01 | 2 | -2/+2 |
| | | |||||
| * | Improves documentation of Capture helper [ci skip] | Alvaro Pereyra | 2012-12-01 | 2 | -14/+13 |
| | | |||||
| * | Removes :nodoc: tag on AtomFeedHelper [ci skip] | Alvaro Pereyra | 2012-12-01 | 1 | -3/+3 |
| | | |||||
| * | Removes unneeded 'Example' tags and whitespaces [ci skip] | Alvaro Pereyra | 2012-12-01 | 1 | -45/+42 |
| | | |||||
| * | nodoc AD & AV railties classes | Carlos Duclos | 2012-12-01 | 2 | -2/+2 |
| | | |||||
| * | Remove :nodoc from SanitizeHelper module [ci skip] | HPNeo | 2012-12-01 | 1 | -1/+1 |
| | | |||||
| * | Removes :nodoc: label [ci skip] | Alvaro Pereyra | 2012-12-01 | 1 | -1/+1 |
| | | |||||
| * | Improves documentation on favicon_link_tag | Alvaro Pereyra | 2012-12-01 | 1 | -14/+16 |
| | | |||||
| * | Update documentation for javascript_include_tag [ci skip] | HPNeo | 2012-12-01 | 1 | -10/+13 |
| | | |||||
* | | Fixed issue where routes with globs caused constraints on that glob to | Maura Fitzgerald | 2012-12-04 | 1 | -1/+1 |
| | | | | | | | | | | | | 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 Kemper | 2012-12-03 | 1 | -0/+11 |
| | | | | | | | | 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 Senn | 2012-12-02 | 1 | -1/+1 |
|/ | |||||
* | hash filters should be accessed with symbols or strings | Francesco Rodriguez | 2012-11-30 | 1 | -3/+5 |
| | |||||
* | added examples when options is string | Takehiro Adachi | 2012-11-29 | 1 | -3/+9 |
| | |||||
* | Remove observers and sweepers | Rafael Mendonça França | 2012-11-28 | 2 | -121/+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-file | Rafael Mendonça França | 2012-11-27 | 1 | -5/+7 |
|\ | | | | | 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 Woosley | 2012-11-26 | 1 | -5/+7 |
| | | |||||
* | | Cleanup CacheHelper changes allowing opt-out of cache digests | Drew Ulmer | 2012-11-27 | 1 | -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. | ||||
* | | No sort Hash options in #grouped_options_for_select | Sergey Kojin | 2012-11-27 | 1 | -6/+4 |
| | | |||||
* | | Fix Strong Parameters docs. | Uģis Ozols | 2012-11-27 | 1 | -2/+1 |
| | | | | | | | | | | It's only possible to inherit from ActiveRecord::Base and not include it. | ||||
* | | unshift html-scanner into $LOAD_PATH rather than append | Akira Matsuda | 2012-11-27 | 1 | -1/+1 |
| | | |||||
* | | Remove warning of circular require | Rafael Mendonça França | 2012-11-27 | 1 | -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 value | Elia Schito | 2012-11-27 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #8316 from roberto/assert_template_validate_options | Carlos Antonio da Silva | 2012-11-26 | 1 | -0/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | 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 keys | Roberto Soares | 2012-11-25 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #8317 from latortuga/cache-digest-opt-out | David Heinemeier Hansson | 2012-11-26 | 1 | -1/+23 |
|\ \ \ | |/ / |/| | | Add explicit opt-out for fragment cache digesting | ||||
| * | | Add explicit opt-out for fragment cache digesting | Drew Ulmer | 2012-11-25 | 1 | -1/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_string | Carlos Antonio da Silva | 2012-11-25 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | assert_template("") will now fail no matter whether a template has been rendered or not. | ||||
| * | | `assert_template` fails with empty string. | Roberto Soares | 2012-11-23 | 1 | -8/+4 |
| | | | |||||
| * | | `assert_template` fails with empty string when a template has been rendered | Roberto Soares | 2012-11-23 | 1 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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_id | Carlos Antonio da Silva | 2012-11-24 | 1 | -0/+5 |
|\ \ \ | |_|/ |/| | | Document :hidden_field_id option for fields_for [ci skip] | ||||
| * | | document :hidden_field_id option for fields_for | Yves Senn | 2012-11-24 | 1 | -0/+5 |
| | | | |||||
* | | | Refector a bit to remove extra slice iteration and splat call | Carlos Antonio da Silva | 2012-11-24 | 1 | -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 hashes | Carlos Antonio da Silva | 2012-11-24 | 2 | -4/+4 |
| | | | |||||
* | | | Simplify scope options recovery by using merge! | Carlos Antonio da Silva | 2012-11-24 | 1 | -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 name | Carlos Antonio da Silva | 2012-11-24 | 1 | -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 Hash | Carlos Antonio da Silva | 2012-11-24 | 1 | -7/+4 |
| |/ |/| | |||||
* | | Allow setting a symbol as path in scope on routes | Guillermo Iguaran | 2012-11-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 methods | Carlos Antonio da Silva | 2012-11-21 | 3 | -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_sessions | Jon Leighton | 2012-11-21 | 2 | -11/+26 |
|\ \ | | | | | | | Store FlashHashes in the session as plain hashes |