aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-011-0/+2
|\ | | | | | | | | Conflicts: railties/guides/source/contributing_to_ruby_on_rails.textile
| * Merge branch 'master' of github.com:lifo/docrailsDan Pickett2011-04-291-0/+2
| |\
| | * document HTML::Selector's :has(string) pseudo classmisfo2011-04-231-0/+2
| | |
* | | Prototype and Scriptaculous are no longer vendored, but provided by ↵Xavier Noria2011-04-301-4/+3
|/ / | | | | | | prototype-rails from now on, also the -j option of the application generator is removed
* | Merged pull request #327 from dcrec1/master.José Valim2011-04-282-3/+17
|\ \ | | | | | | Prefix option for number_to_human_size
| * | added a :prefix option to number_to_human_sizeDiego Carrion2011-04-272-3/+17
| | |
* | | upgrade rack-mountNeeraj Singh2011-04-281-1/+1
| | | | | | | | | | | | Newer version is a few minor performance fixes
* | | Allow a label with the value option to have value-specific translations.Jason Garber2011-04-272-2/+13
|/ /
* | prevent errors when passing a frozen string as a param to ↵misfo2011-04-282-1/+15
| | | | | | | | | | | | | | ActionController::TestCase#process since ActionDispatch::Http::Parameters#encode_params will force encoding on all params strings (when using an encoding aware Ruby), dup all strings passed into process. This prevents modification of params passed in and, more importantly, doesn't barf when a frozen string is passed thanks and high fives to kinsteronline
* | Merged pull request #313 from chadk/master.David Heinemeier Hansson2011-04-262-2/+17
|\ \ | | | | | | [patch] Asset helpers should understand scheme-relative URLs
| * | moving check fo scheme-relative URI into is_uri?Chad Krsek2011-04-261-9/+2
| | |
| * | asset helpers should understand scheme-relative URLsChad Krsek2011-04-262-2/+24
| | |
| * | Revert "asset helpers should understand scheme-relative URLs"Chad Krsek2011-04-252-24/+2
| | | | | | | | | | | | This reverts commit 057412ce38ead06307a887dca333837a99f84f22.
| * | asset helpers should understand scheme-relative URLsChad Krsek2011-04-252-2/+24
| | |
* | | bump the i18n gem to 0.6.0beta1 and update docs for the i18n exception ↵Sven Fuchs2011-04-262-4/+4
| | | | | | | | | | | | | | | | | | handler [#6739 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Merged pull request #277 from kuinak/master.Aaron Patterson2011-04-251-1/+1
|\ \ \ | |/ / |/| | Correct documentation for asset host strategy for 1.9.2
| * | ruby 1.9.2 and other ruby implementations may not return the same hash value ↵Evan Petrie2011-04-141-1/+1
| | | | | | | | | | | | for the same string each time. This can result in your static assets being served from different asset hosts, which makes browser caching less effective. Use md5 or some other digest method instead.
* | | added test for number_to_phone with an empty string and area code trueDiego Carrion2011-04-251-0/+1
| | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | | Fix tests, main_app mounted helper must be defined explicitly now.Piotr Sarnacki2011-04-251-0/+1
| | |
* | | Make ActionController::Base.modules_for_helpers and ↵Piotr Sarnacki2011-04-252-37/+37
| | | | | | | | | | | | ActionController::Base.all_helpers_from_path public methods
* | | Explicitly define main_app proxyPiotr Sarnacki2011-04-251-2/+1
| | |
* | | rename test case to better describe use caseDavid Chelimsky2011-04-251-6/+6
| |/ |/| | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-236-35/+35
|\ \ | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
| * | Remove HTML escaping from Record Tag Helper docs.Semyon Perepelitsa2011-04-221-3/+3
| | |
| * | Replace example hostname with "example.com".Joost Baaij2011-04-215-32/+32
| | | | | | | | | | | | | | | The hostname used in these comments actually exists, which is undesirable. See also RFC 2606.
* | | show http method in routing error messageSchneems2011-04-231-1/+1
| | |
* | | We cant use assert_block because its buggy in MiniTest and wont actually ↵David Heinemeier Hansson2011-04-221-1/+1
| | | | | | | | | | | | show you the failure message you provide -- instead you just always get a "Expected block to return true"
* | | Add shorthand for js and css compressorsJoshua Peek2011-04-221-0/+37
| | |
* | | Only include SprocketsHelper into assets contextJoshua Peek2011-04-211-3/+4
| | |
* | | Fix tests on 1.8 by explicitly checking for strings (which also improves ↵José Valim2011-04-201-1/+9
|/ / | | | | | | performance).
* | Use initialize_copy! to proper initialize now on clone.José Valim2011-04-191-15/+18
| |
* | Don't reuse a closed flash when using nowFlorent Piteau2011-04-202-1/+13
| |
* | Actually add an abstract class, so it is easier to get rid of old asset ↵José Valim2011-04-194-111/+136
| | | | | | | | paths in the future.
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-195-14/+16
|\ \ | | | | | | | | | | | | | | | Conflicts: railties/guides/source/ajax_on_rails.textile railties/guides/source/generators.textile
| * | Fixing another example resultMatt Duncan2011-04-151-1/+1
| | |
| * | Removing incorrect example resultsMatt Duncan2011-04-151-2/+2
| | |
| * | Fix syntax error in exampleMatt Duncan2011-04-151-1/+1
| | |
| * | Fixing more spacing inconsistenciesMatt Duncan2011-04-152-3/+3
| | |
| * | Making spacing consistentMatt Duncan2011-04-151-2/+2
| | |
| * | Fixing missing colon on symbol in exampleMatt Duncan2011-04-151-1/+1
| | |
| * | Negative format example should use a negative numberMatt Duncan2011-04-151-1/+1
| | |
| * | Days are never approximated using 'about'Matt Duncan2011-04-151-1/+1
| | |
| * | Making example result match actual resultMatt Duncan2011-04-151-1/+1
| | |
| * | Including actual usage in exampleMatt Duncan2011-04-151-1/+3
| | |
* | | Include modules to the context in the railtie.José Valim2011-04-192-6/+7
| | |
* | | Let's use inheritance here, shall we?José Valim2011-04-196-66/+43
| | |
* | | Switch to asset_path and make it available in the Sprockets::Context (now ↵David Heinemeier Hansson2011-04-195-40/+42
| | | | | | | | | | | | you can do asset_path("logo.png") in a stylesheet.css.erb file and get fingerprinting)
* | | Cleanup compute_sprockets_path -- when you are reaching for code comments, ↵David Heinemeier Hansson2011-04-191-21/+30
| | | | | | | | | | | | the method could be simpler
* | | All assets, including images, audio, and video, now uses the asset pipeline ↵David Heinemeier Hansson2011-04-194-8/+44
| | | | | | | | | | | | when its on
* | | Do not stream on HTTP/1.0.José Valim2011-04-192-3/+15
| | |