Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1877 from arunagw/fix_mime | José Valim | 2011-06-28 | 2 | -4/+4 |
|\ | | | | | Fix test to use Mime::Zip | ||||
| * | Fix test to use Mime::Zip | Arun Agrawal | 2011-06-28 | 2 | -4/+4 |
|/ | |||||
* | Edited actionpack/CHANGELOG via GitHub | José Valim | 2011-06-28 | 1 | -0/+4 |
| | |||||
* | Merge pull request #1875 from esad/master | José Valim | 2011-06-28 | 3 | -2/+44 |
|\ | | | | | Fixed issue #1847 | ||||
| * | Make send_file guess content-type from file extension, if type wasn't ↵ | Esad Hajdarevic | 2011-06-28 | 2 | -2/+32 |
| | | | | | | | | 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 |
|/ | |||||
* | remove the check for needs_type_condition? because ensure_proper_type will ↵ | Aaron Patterson | 2011-06-27 | 2 | -3/+4 |
| | | | | pick up the type column | ||||
* | stop using && for the short circuit side effect | Aaron Patterson | 2011-06-27 | 1 | -1/+1 |
| | |||||
* | let strings be converted to symbols inside the interpreter | Aaron Patterson | 2011-06-27 | 1 | -2/+2 |
| | |||||
* | avoice paying hash cost if there are no serialized attributes | Aaron Patterson | 2011-06-27 | 1 | -3/+4 |
| | |||||
* | cache column defaults for AR object instantiation | Aaron Patterson | 2011-06-27 | 3 | -3/+16 |
| | |||||
* | AR object instantiation is ~30% faster in the simple case | Aaron Patterson | 2011-06-27 | 2 | -1/+17 |
| | |||||
* | initialize instance variables | Aaron Patterson | 2011-06-27 | 1 | -0/+2 |
| | |||||
* | oops! remove debugging codes | Aaron Patterson | 2011-06-27 | 1 | -1/+0 |
| | |||||
* | default create_with_value to a hash so we can eliminate conditionals, add ↵ | Aaron Patterson | 2011-06-27 | 5 | -5/+14 |
| | | | | test surrounding create_with(nil) behavior | ||||
* | Merge pull request #1871 from guilleiguaran/arel-2-1-3 | Aaron Patterson | 2011-06-27 | 2 | -2/+2 |
|\ | | | | | Bump ARel to 2.1.3 | ||||
| * | Bump ARel to 2.1.3 | Guillermo Iguaran | 2011-06-27 | 2 | -2/+2 |
| | | |||||
* | | Merge pull request #1870 from chriseppstein/asset_urls_master | Santiago Pastorino | 2011-06-27 | 8 | -72/+216 |
|\ \ | | | | | | | Asset urls master | ||||
| * | | Added a configuration setting: | Chris Eppstein | 2011-06-27 | 6 | -17/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 5 | -27/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 5 | -47/+129 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | OrderedOptions must implement respond_to? if it implements method_missing. | Chris Eppstein | 2011-06-27 | 2 | -9/+7 |
| | | | |||||
* | | | the generated ALT attribute for images no longer contains the digest, if any | Xavier Noria | 2011-06-27 | 2 | -1/+13 |
|/ / | |||||
* | | Add JavaScript Runtime name to the Rails Info properties (thanks Sam Ruby) | David Heinemeier Hansson | 2011-06-27 | 1 | -0/+4 |
| | | |||||
* | | Merge pull request #1481 from arunagw/lib_assets | David Heinemeier Hansson | 2011-06-27 | 2 | -1/+3 |
|\ \ | | | | | | | Generating /lib/assets for assets | ||||
| * | | Using lib/assets only. Javascripts/Stylesheets people can fill later. | Arun Agrawal | 2011-06-16 | 2 | -1/+3 |
| | | | |||||
* | | | Merge pull request #1861 from dchelimsky/fixture_path | Santiago Pastorino | 2011-06-25 | 2 | -1/+8 |
|\ \ \ | |_|/ |/| | | Get the fixture_path from self.class instead of ActiveSupport::TestCase. | ||||
| * | | Get the fixture_path from self.class instead of ActiveSupport::TestCase. | David Chelimsky | 2011-06-25 | 2 | -1/+8 |
|/ / | | | | | | | | | | | 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. | ||||
* | | Merge pull request #1853 from arunagw/string_parameterize | Xavier Noria | 2011-06-25 | 1 | -1/+1 |
|\ \ | | | | | | | StringToParameterizeWithNoSeparator: dashed parameter will not change. | ||||
| * | | StringToParameterizeWithNoSeparator: dashed parameter will not | Arun Agrawal | 2011-06-25 | 1 | -1/+1 |
|/ / | | | | | change. | ||||
* | | registers support for acronyms in the CHANGELOG of Active Support | Xavier Noria | 2011-06-24 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #1648 from dlee/acronyms | Xavier Noria | 2011-06-24 | 7 | -103/+251 |
|\ \ | | | | | | | Inflector support for acronyms (Issue #1366) | ||||
| * | | Add acronym support to Inflector; Issue #1366 | David Lee | 2011-06-11 | 4 | -11/+105 |
| | | | |||||
| * | | Refactor | David Lee | 2011-06-11 | 4 | -94/+145 |
| | | | |||||
| * | | Test retain delimiter in parameterization inflector | David Lee | 2011-06-11 | 2 | -2/+5 |
| | | | |||||
* | | | 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 pull request #1848 from raviolicode/postgresql_order_multiple_params | Santiago Pastorino | 2011-06-24 | 2 | -1/+8 |
|\ \ \ | | | | | | | | | Fix for complex ordering of multiple columns on postgresql | ||||
| * | | | Improve ordering of multiple columns on postgresql | Lucia Escanellas | 2011-06-24 | 2 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | * Only on postgresql, order("first asc, second asc") was invalid * Closes #1720 | ||||
* | | | | Merge pull request #1840 from wildchild/master | Santiago Pastorino | 2011-06-23 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Minor formatting fix | ||||
| * | | | | Minor formating fix | Alexander Uvarov | 2011-06-24 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #1829 from wildchild/master | José Valim | 2011-06-23 | 3 | -3/+32 |
|\| | | | | | | | | | | | | | | Allow to specify roles for mass-assignment as array | ||||
| * | | | | Follow rails convention by using Array.wrap | Alexander Uvarov | 2011-06-23 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | Allow to specify mass-assignment roles as array | Alexander Uvarov | 2011-06-23 | 3 | -3/+31 |
| | | | | | |||||
* | | | | | Apply the default scope earlier when doing calculations. Fixes #1682. | Jon Leighton | 2011-06-23 | 3 | -5/+24 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #1835 from metaskills/ss_rake_master | Aaron Patterson | 2011-06-23 | 1 | -6/+7 |
|\ \ \ \ | | | | | | | | | | | Update SQL Server DB Rake Tasks | ||||
| * | | | | Update SQL Server db related rake tasks. | Ken Collins | 2011-06-23 | 1 | -6/+7 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | * Uses open source smoscript since scptxfr came out in 2000. * Uses sqlcmd which replaces osql. * Takes advantage of host/user/pass passed down by TinyTDS. | ||||
* | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-23 | 15 | -99/+143 |
|\ \ \ \ | |||||
| * | | | | updated rspec link | Mikhail Dieterle | 2011-06-23 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | grammar changes in named routes description and clarity around possibilities ↵ | Matt Jankowski | 2011-06-22 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | for options |