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,015 Commits 34 Branches 105 Tags
c1938d16fd09ff5addb0bd071fd483559e1cbbbc
Commit Graph

7032 Commits

Author SHA1 Message Date
Andrew White
c1938d16fd Define ActiveSupport#to_param as to_str - closes #1663 2011-06-12 15:23:12 +01:00
Santiago Pastorino and José Ignacio Costa
41b73fe033 Revert "Make sure that we don't perform in-place mutation on SafeBuffer string" 
This reverts commit 317e7c829d.
 2011-06-10 23:08:58 -03:00
Aaron Patterson
e88508eb20 Merge pull request #1641 from sikachu/3-1-stable-render-inline 
Render inline fix for 3-1-stable
 2011-06-10 16:28:06 -07:00
ganesh
b3ade0cc05 shallow_path example updated 2011-06-11 01:16:40 +02:00
Prem Sichanugrist
317e7c829d Make sure that we don't perform in-place mutation on SafeBuffer string 
This will make sure `render :inline` is working.

Closes #1633
 2011-06-10 18:43:59 -04:00
Prem Sichanugrist
ff48edd442 Update CHANGELOG to mention the json_escape change 2011-06-10 18:43:50 -04:00
Andrew White
21a8dc7a79 Ensure number helpers can handle HTML safe strings - closes #1597. 2011-06-10 11:21:16 +01:00
Aaron Patterson
279781f896 bumping to 3.1.0.rc4 2011-06-09 15:53:49 -07:00
Aaron Patterson
58ac641d3e ensuring that json_escape returns html safe strings when passed an html safe string 2011-06-09 15:29:30 -07:00
Prem Sichanugrist
66dbef6d79 Make sure escape_javascript return SafeBuffer if the incoming argument is already html_safe 2011-06-09 14:28:21 -04:00
David Heinemeier Hansson
fa6b12aeed Indention style + whitespace for readability 2011-06-09 01:29:25 +02:00
David Heinemeier Hansson
da8ba393bd If you set a js_compressor, it means that you want shit compressed -- we dont need a second option to turn that on 2011-06-09 01:28:56 +02:00
Aaron Patterson
aefd703443 bumping to 3.1.0.rc3 2011-06-08 14:34:20 -07:00
Prem Sichanugrist
d2b0605a3f Update CHANGELOG to mention the new SafeBuffer change 2011-06-08 11:59:01 -04:00
Paul Gallagher
4663893726 Make escape_javascript happy to handle SafeBuffers 
* see GH#1553
* allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block
 2011-06-08 11:06:58 -04:00
Guillermo Iguaran
6e9714ca1e Allow multiple sources in Sprockets helpers 2011-06-08 08:13:50 -05:00
Prem Sichanugrist
719e05da06 Add proper fix to mail_to helper. 
* Fix the problem on manipulating on the `ActiveSupport::SafeBuffer`
* Make sure that we run `escape_javascript` on the `String`, to avoid unexpected behavior.
 2011-06-08 01:51:48 -04:00
Prem Sichanugrist
d1a74755b3 Adapt [823aa223ef] to make sure we perform cloning before manipulation only on OutputBuffer. 
After the fragment rendering, `Builder` returns the `String` object instead of `ActionView::OutputBuffer`. Somehow the same procedure which was in [823aa223ef] does not play nice with the String, and result in the fragment got lost.
 2011-06-08 01:07:39 -04:00
Prem Sichanugrist
509aa66360 Fix simple_format helper to work correctly with the new SafeBuffer rule. 
This has been ported from `3-0-stable` [ed3796434a]
 2011-06-08 00:25:56 -04:00
Christopher Meiklejohn
eb85169b9a Fragment caching needs to operate on the pure output, not the 
safebuffer.
 2011-06-08 00:24:18 -04:00
Aaron Patterson
26648978b6 bumping to rails 3.1.0.rc2 2011-06-07 17:01:20 -07:00
Guillermo Iguaran
527499ca12 Remove trailing white-spaces 2011-06-06 22:45:45 +02:00
Vijay Dev
dff7c62ef0 some grammatical corrections 2011-06-06 22:45:10 +02:00
Guillermo Iguaran
48b90967b0 Removing trailing white-spaces 2011-06-06 22:42:17 +02:00
Mark Roghelia
8ac4e4dbce The example in the API docs incorrectly indicated that form_for would use the same default route for both new and previously persisted records. The default path given in the example would have generated a routing error for new records. form_for actually uses polymorphic_path to determine which route to use based on the state of the record. The example has been updated to reflect the method's actual behavior. 2011-06-06 22:42:05 +02:00
diego
9d275a8bd2 Added missing quote in grouped_options_for_select example 2011-06-06 22:36:12 +02:00
David Heinemeier Hansson
50a7e8e0a0 Depend on latest Sprockets beta 2011-06-06 18:29:07 +02:00
Vijay Dev
a81c2ec560 fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0 2011-06-04 09:01:26 +05:30
wycats
63467a4301 Restructure TemplateAssertions-related code to eliminate circular requires. 
Also, no need to include dependencies in AS::Concerns inside included blocks.
 2011-06-04 08:57:56 +05:30
Larry Sprock
3b75ec92f5 Bring inline with master 2011-06-03 10:55:10 -07:00
Larry Sprock
8b8e18198b Don't need asset_path twice 2011-06-03 10:54:35 -07:00
Larry Sprock
9b55007486 Generate correct asset paths when using asset pipeline 2011-06-03 10:34:49 -07:00
wycats
80745f19c4 Another missed piece of the merge. I screwed up this merge. I am sorry :( 2011-06-03 10:14:02 -07:00
wycats
de6394208c Remove explicit sprockets usage. This should have come over in the merge, but for some reason it didn't. 2011-06-02 17:06:34 -07:00
wycats
5b300a9ea4 Pull back in asset_path 2011-06-02 16:10:38 -07:00
wycats
7a8d3d7603 Make sure that Sprockets::Helpers::RailsHelper can be found 2011-06-02 10:59:13 -07:00
wycats
ee018be796 Move the last pockets of Sprockets stuff into the Sprockets directory 2011-06-02 10:59:13 -07:00
wycats
476d679c33 Move javascript/css helpers into the Sprockets helper and just have them override the old behavior 2011-06-02 10:59:13 -07:00
wycats
866889c526 Start moving some logic from being embedded in AV into the Rails Sprockets extensions 2011-06-02 10:59:13 -07:00
jacott
db05478d92 fixed asset_paths when called from sprockets for relative_url_root 2011-05-28 08:50:00 +02:00
dmathieu
9cb8a18200 don't raise an exception if the format isn't recognized 
Fixed while traveling to heuruko
 2011-05-27 07:50:44 +02:00
tomhuda
e1043cc848 Move SCSS generators and default templates from Rails to the Sass Railtie (d435726312601edb3ba6f97b34f562221f72c1f8). 
* Sass gem registers a compressor
* Sass gem registers generators for assets and scaffold
* Create a default stylesheet_engine ("css") for apps that remove the Sass gem
 2011-05-24 16:13:39 -07:00
tomhuda
7eed5c0303 Change compressor API so that plugins can register default compressors for their stylesheet or JS engines and still allow the user to turn off compression 2011-05-24 16:13:32 -07:00
Jon Leighton
5a6927ec1e Replace references to ActiveSupport::SecureRandom with just SecureRandom, and require 'securerandom' from the stdlib when active support is required. 2011-05-23 20:24:44 +01:00
José Valim
72368610f0 Use Rack 1.3.0. 2011-05-23 00:33:48 -07:00
Joshua Peek
7ad24a7d96 Require sprockets beta 8 2011-05-22 20:10:13 -05:00
Joshua Peek
27159dff0f Add debug_asset support 2011-05-22 15:10:53 -05:00
Joshua Peek
cdc9c3c4af Lock to stable sprockets beta 2011-05-22 14:50:11 -05:00
José Valim
9164dda151 Fix I18n dependency as final is out. 2011-05-22 13:39:13 +02:00
David Heinemeier Hansson
82857adc56 Bump versions for rc1 2011-05-21 20:56:52 -05:00