| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | require 'thread' before using mutex | José Valim | 2011-07-01 | 1 | -0/+1 |
| | | |||||
| * | It's autoload all the way down | Andrew White | 2011-07-01 | 1 | -1/+1 |
| | | |||||
| * | Don't require ActionView::Context as it's autoloaded | Andrew White | 2011-07-01 | 1 | -1/+0 |
| | | |||||
| * | Revert "Add missing require for ActionView::AssetPaths" | Andrew White | 2011-07-01 | 1 | -1/+0 |
| | | | | | This reverts commit 987eb7d4236513978e3cfcd5c3c159d95d2a84c8. | ||||
| * | Add missing requires for ActionView::Context and Module#instance_method_names | Andrew White | 2011-07-01 | 1 | -0/+2 |
| | | |||||
| * | Add missing require for ActionView::AssetPaths | Andrew White | 2011-07-01 | 1 | -0/+1 |
| | | |||||
| * | Revert "Add method fields_for_with_index to FormHelper" | José Valim | 2011-07-01 | 1 | -18/+6 |
| | | | | | | | | | This reverts commit 7c562d5e460d97b18e4f3367b3cfb13401732920. Conflicts: actionpack/lib/action_view/helpers/form_helper.rb | ||||
| * | Merge pull request #1927 from bogdan/select_multiple_index | José Valim | 2011-07-01 | 1 | -1/+1 |
| |\ | | | | | Fixed ActionView::FormOptionsHelper#select with :multiple => false | ||||
| | * | Fixed ActionView::FormOptionsHelper#select with :multiple => false | Bogdan Gusiev | 2011-06-30 | 1 | -1/+1 |
| | | | |||||
| * | | Make sure respond_with with :js tries to render a template in all cases | José Valim | 2011-06-30 | 1 | -0/+5 |
| | | | |||||
| * | | Master version is 3.2.0.beta | Santiago Pastorino | 2011-06-30 | 1 | -2/+2 |
| | | | |||||
| * | | Add has_key? and key? methods to CookieJar removed in 0ca69ca65f83b4bb34f8 | José Valim | 2011-06-30 | 1 | -0/+5 |
| |/ | |||||
| * | Move Coffee generators and templates to Coffee Railtie and create ↵ | Santiago Pastorino | 2011-06-29 | 1 | -9/+0 |
| | | | | | javascript_engine ("js") for apps that remove Coffee gem | ||||
| * | sub suffices here | Xavier Noria | 2011-06-29 | 1 | -1/+1 |
| | | |||||
| * | Revert "Delegate to @flashes with 'delegate' instead of manually." | Aaron Patterson | 2011-06-29 | 1 | -2/+24 |
| | | | | | This reverts commit 701e8554a8f69b0c81fe794cba985bfda804161b. | ||||
| * | Delegate to @flashes with 'delegate' instead of manually. | Ben Orenstein | 2011-06-29 | 1 | -24/+2 |
| | | |||||
| * | [IMPORTANT] Make "sprockets/railtie" require explicit. | José Valim | 2011-06-29 | 3 | -1/+31 |
| | | | | | | | | | | | This makes "sprockets/railtie" explicit. This means that sprockets will be loaded when you require "rails/all". If you are not using requiring "rails/all", you need to manually load it with all other framework railties. In order to be complete, this commit also adds --skip-sprockets to the rails generator. | ||||
| * | Fix test to use Mime::Zip | Arun Agrawal | 2011-06-28 | 1 | -3/+3 |
| | | |||||
| * | Make send_file guess content-type from file extension, if type wasn't ↵ | Esad Hajdarevic | 2011-06-28 | 1 | -2/+13 |
| | | | | | supplied (Issue #1847). Update tests & documentation. | ||||
| * | Register some commonly used mime types (png, jpeg, pdf, zip etc.) per default | Esad Hajdarevic | 2011-06-28 | 1 | -0/+12 |
| | | |||||
| * | Merge pull request #1870 from chriseppstein/asset_urls_master | Santiago Pastorino | 2011-06-27 | 4 | -49/+122 |
| |\ | | | | | Asset urls master | ||||
| | * | Added a configuration setting: | Chris Eppstein | 2011-06-27 | 4 | -10/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.action_controller.default_asset_host_protocol It's best to leave this unset. When unset the :request protocol is used whenever it can be and :relative is used in the other situations. When set to :request then assets hosts will be disabled when there is no request in scope and will use the request protocol whenever a request is in scope. If set to :relative, then a relative protocol is always used except for stylesheet link tags which must use the :request protocol to avoid double downloads in IE6&7. Conflicts: actionpack/lib/sprockets/helpers/rails_helper.rb actionpack/test/template/sprockets_helper_test.rb | ||||
| | * | Move the config bootstrapping to initialization to minimize access to the ↵ | Chris Eppstein | 2011-06-27 | 2 | -11/+14 |
| | | | | | | | | | Rails.application global. | ||||
| | * | Stylesheet link tags should use the request protocol to avoid duplicate ↵ | Chris Eppstein | 2011-06-27 | 4 | -19/+42 |
| | | | | | | | | | | | | | | | | | | | download of stylesheets in IE7 and IE8. Conflicts: actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb actionpack/lib/sprockets/helpers/rails_helper.rb | ||||
| | * | Add asset_url helper and refactor the asset paths so that asset hosts can be ↵ | Chris Eppstein | 2011-06-27 | 3 | -39/+75 |
| | | | | | | | | | | | | | | | | | | | | | used during asset precompilation. Conflicts: actionpack/lib/action_view/asset_paths.rb actionpack/lib/sprockets/helpers/rails_helper.rb actionpack/test/template/sprockets_helper_test.rb | ||||
| * | | the generated ALT attribute for images no longer contains the digest, if any | Xavier Noria | 2011-06-27 | 1 | -1/+5 |
| |/ | |||||
| * | Get the fixture_path from self.class instead of ActiveSupport::TestCase. | David Chelimsky | 2011-06-25 | 1 | -1/+1 |
| | | | | | | | This allows test classes that are not subclasses of ActiveSupport::TestCase (like those in rspec-rails) to interact with with this variable without having to reference ActiveSupport::TestCase. | ||||
| * | make the logs a little simpler to view, put the render message inline with ↵ | James Cox | 2011-06-24 | 2 | -5/+6 |
| | | | | | other events, pull processing to char[0] and add a new line to the completed. looks more like a block now, which is useful for serial actions like test/dev | ||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-23 | 3 | -25/+28 |
| |\ | |||||
| | * | grammar changes in named routes description and clarity around possibilities ↵ | Matt Jankowski | 2011-06-22 | 1 | -10/+10 |
| | | | | | | | | | for options | ||||
| | * | use present tense on examples | Matt Jankowski | 2011-06-21 | 1 | -5/+5 |
| | | | |||||
| | * | more detail on how the flow between redirect and show works, and minor grammar | Matt Jankowski | 2011-06-21 | 1 | -7/+9 |
| | | | |||||
| | * | remove extra space and clarify how an exception is made for controller wide ↵ | Matt Jankowski | 2011-06-21 | 1 | -3/+3 |
| | | | | | | | | | layouts | ||||
| | * | reorder layout selection examples to occur in the order that the code does, ↵ | Matt Jankowski | 2011-06-21 | 1 | -5/+6 |
| | | | | | | | | | and provide more detail on why each selection is made | ||||
| * | | Minor refactor | Santiago Pastorino | 2011-06-23 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #1796 from jdeseno/master | Santiago Pastorino | 2011-06-22 | 1 | -1/+3 |
| |\ \ | | | | | | | link_to doesn't allow rel attribute when also specifying method | ||||
| | * | | Allow additional link relations when using method attribute with link_to | Josh | 2011-06-20 | 1 | -1/+3 |
| | | | | |||||
| * | | | Merge pull request #1798 from jeroenj/cachesweeper-fix | Santiago Pastorino | 2011-06-22 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | Fixes an issue where cache sweepers with only after filters would have no controller object | ||||
| | * | | | Fixes an issue where cache sweepers with only after filters would have no ↵ | Jeroen Jacobs | 2011-06-21 | 1 | -0/+1 |
| | |/ / | | | | | | | | | | | | | | | | controller object It would raise undefined method controller_name for nil | ||||
| * | | | Merge pull request #1778 from spohlenz/hash-models | José Valim | 2011-06-22 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Fix nested fields_for when Hash-based model is passed. | ||||
| | * | | | Test for extractable_options? within nested fields_for. | Sam Pohlenz | 2011-06-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | This fixes an error when a record object that is a subclass of Hash is passed to fields_for, which is incorrectly interpreted as field options. | ||||
| * | | | | Require helpers so autoload is properly setup. | José Valim | 2011-06-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Don't use deprecated stuff. | José Valim | 2011-06-21 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | Assign Rails.cache to sprockets | Joshua Peek | 2011-06-21 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Rename AV::Helpers::AssetPaths to AV::AssetPaths to solve autoload mess. | José Valim | 2011-06-21 | 4 | -81/+84 |
| | |/ / |/| | | |||||
| * | | | Only mark the sliced buffer as safe, if it was safe to begin with. | Christopher Meiklejohn | 2011-06-20 | 1 | -1/+2 |
| | | | | |||||
| * | | | Streamline fragment_for SafeBuffer logic to make it more concise. | Christopher Meiklejohn | 2011-06-20 | 1 | -6/+3 |
| | | | | |||||
| * | | | Do not change a frozen text passed to simple_format text helper | Tadas Tamosauskas | 2011-06-20 | 1 | -0/+1 |
| |/ / | |||||
| * / | Call super here to allow SessionHash initialize new stuff for us | Santiago Pastorino | 2011-06-19 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-18 | 3 | -12/+17 |
| |\ | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |