github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
23,647 Commits 34 Branches 105 Tags
e3053ee753c3035e9d8337680212aba525c27376
Commit Graph

7167 Commits

Author SHA1 Message Date
Arun Agrawal
1b957177e7 Fix test to use Mime::Zip 2011-06-28 16:51:19 +05:30
José Valim
76581d0f1b Edited actionpack/CHANGELOG via GitHub 2011-06-28 02:45:27 -07:00
Esad Hajdarevic
2a61d47b55 Make send_file guess content-type from file extension, if type wasn't supplied (Issue #1847). Update tests & documentation. 2011-06-28 06:58:28 +02:00
Esad Hajdarevic
d73269ba53 Register some commonly used mime types (png, jpeg, pdf, zip etc.) per default 2011-06-28 06:56:47 +02:00
Santiago Pastorino
4bcb05de2d Merge pull request #1870 from chriseppstein/asset_urls_master 
Asset urls master
 2011-06-27 14:01:34 -07:00
Xavier Noria
a0960ec2d4 the generated ALT attribute for images no longer contains the digest, if any 2011-06-27 23:00:05 +02:00
Chris Eppstein
024bed387b Added a configuration setting: 
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
 2011-06-27 13:58:51 -07:00
Chris Eppstein
2cc1bc3773 Move the config bootstrapping to initialization to minimize access to the Rails.application global. 2011-06-27 13:55:10 -07:00
Chris Eppstein
6c64e1e3a3 Stylesheet link tags should use the request protocol to avoid duplicate 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
 2011-06-27 13:54:54 -07:00
Chris Eppstein
96137e8bd0 Add asset_url helper and refactor the asset paths so that asset hosts can be 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
 2011-06-27 13:48:36 -07:00
David Chelimsky
a7af1e0051 Get the fixture_path from self.class instead of ActiveSupport::TestCase. 
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.
 2011-06-25 13:59:49 -05:00
James Cox
d446c798a5 make the logs a little simpler to view, put the render message inline with 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 2011-06-24 13:10:06 -07:00
Xavier Noria
1f505a8ef2 Merge branch 'master' of git://github.com/lifo/docrails 2011-06-23 18:08:11 +02:00
José Valim
d49622a1f2 Edited actionpack/actionpack.gemspec via GitHub 2011-06-23 07:38:41 -07:00
Santiago Pastorino
87b548ccac Minor refactor 2011-06-23 00:35:54 -03:00
Santiago Pastorino
7f6eed0447 Merge pull request #1796 from jdeseno/master 
link_to doesn't allow rel attribute when also specifying method
 2011-06-22 20:34:33 -07:00
Santiago Pastorino
6b3342d971 Merge pull request #1798 from jeroenj/cachesweeper-fix 
Fixes an issue where cache sweepers with only after filters would have no controller object
 2011-06-22 10:48:19 -07:00
Joshua Peek
a1f8421060 Revert "Bump sprockets requirement" 
This reverts commit 458512c8fa.
 2011-06-22 11:29:11 -05:00
Jeroen Jacobs
93ff522120 Tests only after filters in cache sweepers 2011-06-22 18:00:46 +02:00
Matt Jankowski
3eaed28c5f grammar changes in named routes description and clarity around possibilities for options 2011-06-22 11:00:56 -04:00
José Valim
3c8c379848 Merge pull request #1778 from spohlenz/hash-models 
Fix nested fields_for when Hash-based model is passed.
 2011-06-22 02:33:12 -07:00
Sam Pohlenz
237f87089c Use real hash model in nested fields_for with hash model test 2011-06-22 10:54:45 +09:30
Matt Jankowski
db4f0ac025 use present tense on examples 2011-06-21 15:12:11 -04:00
José Valim
d6f1291f48 Require helpers so autoload is properly setup. 2011-06-21 15:21:21 -03:00
Joshua Peek
458512c8fa Bump sprockets requirement 2011-06-21 11:27:06 -05:00
José Valim
370b5c14ff Don't use deprecated stuff. 2011-06-21 13:06:23 -03:00
Josh
9c1d0d88a7 Adds a test to check link_to with method & rel options 2011-06-21 07:49:10 -07:00
Matt Jankowski
620bee45fe more detail on how the flow between redirect and show works, and minor grammar 2011-06-21 10:47:37 -04:00
Joshua Peek
4a2b3275a1 Assign Rails.cache to sprockets 2011-06-21 09:39:37 -05:00
Matt Jankowski
538d2a52ce remove extra space and clarify how an exception is made for controller wide layouts 2011-06-21 10:34:31 -04:00
Matt Jankowski
20a9bddfad reorder layout selection examples to occur in the order that the code does, and provide more detail on why each selection is made 2011-06-21 10:31:16 -04:00
José Valim
354709fe89 Rename AV::Helpers::AssetPaths to AV::AssetPaths to solve autoload mess. 2011-06-21 11:24:05 -03:00
Jeroen Jacobs
791127eee4 Fixes an issue where cache sweepers with only after filters would have no controller object 
It would raise undefined method controller_name for nil
 2011-06-21 12:34:00 +02:00
Josh
40e6f437e8 Allow additional link relations when using method attribute with link_to 2011-06-20 22:17:53 -07:00
Christopher Meiklejohn
a52e4189b5 Only mark the sliced buffer as safe, if it was safe to begin with. 2011-06-20 13:52:21 -04:00
Christopher Meiklejohn
d12aa483f2 Streamline fragment_for SafeBuffer logic to make it more concise. 2011-06-20 13:20:42 -04:00
Tadas Tamosauskas
f292f0971f Do not change a frozen text passed to simple_format text helper 2011-06-20 14:51:07 +01:00
Sam Pohlenz
e69eed0e10 Test for extractable_options? within nested fields_for. 
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.
 2011-06-20 11:50:44 +09:30
Santiago Pastorino
4131fd7c79 Call super here to allow SessionHash initialize new stuff for us 2011-06-19 22:00:22 -03:00
Xavier Noria
146ec2d1df Merge branch 'master' of git://github.com/lifo/docrails 2011-06-18 10:11:47 +02:00
Bogdan Gusiev
69fdfab487 Select tag helpers: remove some code dups 2011-06-17 16:54:35 +03:00
R.T. Lechow
6ca18f9037 Typo. 2011-06-16 15:44:21 -04:00
wycats
1844572fd1 Make the API for compression consistent between JS and CSS. By default, users just need to say whether they want compression or not, and a default will be chosen by a Railtie. In the case of CSS, this default is already chosen by the sass-rails gem. 
Users can still explicitly choose a compressor in their application.rb if they have a preference, but will usually want to let plugins choose defaults in their Railties.
 2011-06-16 12:09:36 -07:00
Santiago Pastorino
eedbe1c827 Use html_safe 2011-06-16 12:46:11 -03:00
José Valim
f2c0fb32c0 Remove usage of memoizable from ActionPack. 2011-06-16 08:01:35 -03:00
Wen-Tien Chang
d7aac1f1e4 Also change the default route comment 2011-06-16 14:03:41 +08:00
Vijay Dev
77c8cd7516 form => form_for 2011-06-15 18:56:22 +05:30
Christine Yen
0a67b745be Tweak linebreak in ActionController::Redirecting doc 2011-06-15 03:18:28 -07:00
Christine Yen
c6381657b7 Clarify importance of *_attributes= writer methods for nested fields 2011-06-15 03:15:58 -07:00
Lukáš Konarovský
c0d82ba030 Use assert_equal instead of assert in uploaded file test. 2011-06-15 03:09:27 -07:00