Commit Graph

19065 Commits

Author SHA1 Message Date
Aaron Patterson
541ed2b60d avoid a few comparisons 2010-10-18 16:11:27 -07:00
Krekoten' Marjan
a75d21df06 Fix status initialization when custom status provided
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
2010-10-18 17:34:22 -02:00
Krekoten' Marjan
608bf7b72c AC::Caching DRYup
Remove ActionController::Caching::Pages#caching_allowed
because it duplicates ActionController::Caching#caching_allowed?

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
2010-10-18 17:30:28 -02:00
Aaron Patterson
19c144f1b3 remove strange else block 2010-10-18 10:31:21 -07:00
Aaron Patterson
ca59ec354e skip extra work if no text or phrase was provided 2010-10-18 10:28:56 -07:00
Aaron Patterson
dda81cb177 lets not invert the hash on every iteration through this loop 2010-10-18 10:21:15 -07:00
Aaron Patterson
132f3e2d37 use -= in place of the expanded form 2010-10-18 10:11:32 -07:00
Aaron Patterson
a0a5a2a275 implicitly return nil if there is no number 2010-10-18 10:01:26 -07:00
Aaron Patterson
98d3c41cfb implicit return of nil 2010-10-18 09:58:18 -07:00
Aaron Patterson
9c219bf361 use regex escape sequences to shorten stuff up 2010-10-18 09:57:24 -07:00
Aaron Patterson
081e15f104 join strings rather than resizing buffer 2010-10-18 09:53:01 -07:00
Santiago Pastorino
330327eeec Call html_escape in ERB::Util module and don't mix it in in the helpers 2010-10-18 13:59:56 -02:00
Xavier Noria
df044ec4ac explains why ERB::Util#h is removed before being re-aliased 2010-10-18 17:24:30 +02:00
Santiago Pastorino
9d6917519c Use mysql2 from git for a while 2010-10-18 13:02:10 -02:00
Santiago Pastorino
901973b4d7 Invoke html_escape on the proper receiver 2010-10-18 12:29:03 -02:00
Santiago Pastorino
460c4efd71 Merge CHANGELOGs from 3-0-stable 2010-10-18 12:24:41 -02:00
Santiago Pastorino
31ac1db596 Tidy up a bit this code 2010-10-18 09:49:04 -02:00
Santiago Pastorino
1a0f72d0e3 Why strip only the extension, this can be done by the user 2010-10-18 09:48:24 -02:00
Santiago Pastorino
dfb3ff6698 This or login doesn't make sense 2010-10-18 09:47:21 -02:00
Santiago Pastorino
dc33cd6208 Use unless instead of if nil? 2010-10-18 09:45:37 -02:00
Santiago Pastorino
5f60735194 Add missing require 2010-10-18 08:39:20 -02:00
Andrew White
f7573175de Reset assert_template instance variables between requests [#5832 state:resolved] 2010-10-18 09:57:51 +01:00
Krekoten' Marjan
7b2ec381ca Change def to attr_reader + alias
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-10-18 00:54:58 +02:00
Santiago Pastorino
0d5d70f1a3 parse number only if options[:raise] is provided 2010-10-17 20:44:06 -02:00
Santiago Pastorino
ea7db8ebc1 number_to_phone always return safe 2010-10-17 20:42:13 -02:00
Michael Koziarski
2f9e880431 Rejig the html5 data helper code
Avoid allocating an array each pass through and support String subclasses like SafeBuffers
2010-10-18 11:18:43 +13:00
Stephen Celis
5e79094fc1 HTML5 data attribute helpers [#5825 state:resolved]. 2010-10-18 11:18:42 +13:00
Santiago Pastorino
67df21f895 No need for parenthesis here 2010-10-17 12:34:51 -02:00
Neeraj Singh
f527f9097b no need to check for nil
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
2010-10-17 12:26:47 -02:00
Neeraj Singh
ea14396c45 replace if ! with unless
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
2010-10-17 12:26:32 -02:00
Santiago Pastorino
b44e2abd9f Bump bundler up to 1.0.3 2010-10-16 14:36:25 -02:00
Santiago Pastorino
6c8ea83385 extract formats_regexp as a method 2010-10-16 14:12:41 -02:00
Santiago Pastorino
15d3c77bc2 There's no need now to expose lookup_context as an external API 2010-10-16 13:42:19 -02:00
Santiago Pastorino
0d00d65ad2 Delegate freeze_formats to lookup_context 2010-10-16 13:39:11 -02:00
Jeff Kreeftmeijer
b454bb0a98 Remove the :vew attr_reader from ActionView::AbstractRenderer [#5819 state:resolved]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
2010-10-16 13:02:14 -02:00
Santiago Pastorino
66f805a969 JQuery updated to 1.4.3
Check out http://blog.jquery.com/2010/10/16/jquery-143-released/ for
information on what's new.
2010-10-16 12:30:34 -02:00
Rob Zolkos & Xavier Noria
bc1bcddede implements weeks_ago and prev_week for Date/DateTime/Time [#5122 state:committed] 2010-10-16 02:23:23 +02:00
Santiago Pastorino
4bfe30ca2f delete from :number until the end 2010-10-15 21:09:32 -02:00
Aaron Patterson
dc76e3c38f should sort these ids before asserting they are equal! 2010-10-15 15:47:09 -07:00
Aaron Patterson
552636c652 testing that symbols work as sql literals 2010-10-15 15:46:13 -07:00
Aaron Patterson
1dd266741e fixing an error in the rdoc 2010-10-15 10:43:53 -07:00
Aaron Patterson
eaa7605e2f Revert "refactor delete a little"
This reverts commit f3f34bce8f.
2010-10-15 10:23:05 -07:00
Piotr Sarnacki
b0157f8d04 Removed duplicated method find_root_with_flag
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
2010-10-15 13:17:36 -02:00
Xavier Noria
21ff8849bb in regexps, the dot in a character class is not a metacharacter 2010-10-15 16:31:00 +02:00
André Camargo
c42ea2172e Fix for ActionView::Template#refresh in rails 3.1.0.beta
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-10-15 08:39:10 +02:00
Carl Lerche
69789c3b29 #transaction on the instance level should take options as well 2010-10-14 21:27:40 -07:00
Michael Koziarski
9ebe582830 Revert 0c0b0aa0f2 which introduced a security vulnerability.
This addresses  CVE-2010-3933

Conflicts:

	activerecord/lib/active_record/nested_attributes.rb
2010-10-15 10:27:33 +13:00
Xavier Noria
13f7f89bda Merge branch 'master' of git://github.com/lifo/docrails 2010-10-14 23:15:23 +02:00
José Valim
01ab6f961b Remove :cache => true on lookup templates initialization. 2010-10-14 09:47:49 +02:00
José Valim
aa508c9baf SReorganize autoloads slightly and move two files to lib/action_view root. 2010-10-14 09:32:53 +02:00