Commit Graph

24692 Commits

Author SHA1 Message Date
asmega
ebe9155313 Use typewriter styling on url_for in documentation 2011-08-21 16:40:56 +01:00
Santiago Pastorino
77dfcae385 Merge pull request #2604 from vijaydev/params_wrapper_docs
Minor edit in the params wrapper api docs
2011-08-20 12:20:53 -07:00
Vijay Dev
7da70a431c params wrapper docs correction 2011-08-21 00:25:58 +05:30
Aaron Patterson
257366d118 Merge pull request #2602 from ernie/fix_predicate_builder_primary_key_assumption
Fix assumption of primary key name in PredicateBuilder subquery.
2011-08-20 11:49:17 -07:00
Santiago Pastorino
9ca44e36d3 Merge pull request #2603 from vijaydev/guides
Minor change in the 3.1 release notes
2011-08-20 11:38:45 -07:00
Vijay Dev
7444c620cf minor change in the 3.1 release notes 2011-08-20 23:27:31 +05:30
Ernie Miller
f74f5f7f00 Fix PredicateBuilder clobbering select_values in subquery. 2011-08-20 13:16:39 -04:00
Ernie Miller
e2ae015952 Fix assumption of primary key name in PredicateBuilder subquery. 2011-08-20 13:00:26 -04:00
Santiago Pastorino
8bd76aa50e Merge pull request #2581 from guilleiguaran/debug-assets-in-dev
Debug assets by default in development and test environments
2011-08-19 15:28:52 -07:00
Xavier Noria
72bc89fac7 Merge pull request #2589 from vijaydev/guides
Mailer guide fixes
2011-08-19 13:09:50 -07:00
Vijay Dev
129ad7226d mailer guide: fixes indentation, and use fixed width fonts wherever necessary 2011-08-20 00:17:37 +05:30
Guillermo Iguaran
7223f10acd Debug assets by default in development and test environments 2011-08-18 15:35:41 -05:00
Xavier Noria
cc90adfd2a minor details revised in a gsub
Regexps have a construct to express alternation of characters, which
is character classes. In addition to being the most specific idiom to
write this pattern, it reads better without the backslashes. Also, it
is better not to use a capture if none is needed. As a side-effect of
these changes, the gsub is marginally faster, but speed is not the
point of this commit.
2011-08-18 03:09:18 -07:00
Xavier Noria
12c0ea954a Merge branch 'master' of https://github.com/lifo/docrails 2011-08-17 17:30:47 -07:00
Xavier Noria
3b5eb11664 fixes generation of the AR querying guide 2011-08-17 14:41:49 -07:00
Xavier Noria
5912f3f97e Merge pull request #2551 from rgo/remove-blank-spaces-application-css
Cleanup application.css
2011-08-17 02:37:50 -07:00
Jeff Dutil
6783ce0de4 Updates to remove extra whitespaces and notably fix a whitespace issue with ajax_on_rails causing a code block not to render the entire block properly. 2011-08-16 23:35:40 -04:00
Jeff Dutil
6eadf5d192 Fix typo in i18n.textile header and remove extra whitespace. 2011-08-16 23:04:16 -04:00
Jeff Dutil
f302370c05 Fix ruby typo to correctly render code block in initializer.textile 2011-08-16 22:59:36 -04:00
Jeff Dutil
7ff894dcc7 Fix spacing in plugins.textile to fix html rendering and remove extra whitespace from security.textile 2011-08-16 22:48:01 -04:00
Rafa García
3ebb322f21 Cleanup application.css 2011-08-17 04:01:07 +02:00
Aaron Patterson
22e611ed5b making the order more clear, adding linux distros mailing lists to our cc 2011-08-16 17:39:58 -07:00
Aaron Patterson
9d9f59139e adding lessons learned so I do not make the same mistake twice 2011-08-16 16:30:29 -07:00
Aaron Patterson
5f94b93279 Properly escape glob characters. 2011-08-16 15:28:27 -07:00
Aaron Patterson
bfc432574d properly escape html to avoid invalid utf8 causing XSS attacks 2011-08-16 15:24:58 -07:00
Aaron Patterson
586a944ddd Tags with invalid names should also be stripped in order to prevent
XSS attacks.  Thanks Sascha Depold for the report.
2011-08-16 15:24:48 -07:00
Aaron Patterson
8a39f411dc prevent sql injection attacks by escaping quotes in column names 2011-08-16 15:24:42 -07:00
Aaron Patterson
b0555bb88b adding security email address 2011-08-16 11:30:02 -07:00
Xavier Noria
98fac9902b Merge branch 'master' of github.com:rails/rails 2011-08-16 11:19:20 -07:00
Jon Leighton
8e23615245 Use lazy load hooks to set parameter wrapping configuration. This means that it doesn't force Action Controller / Active Record to load, but it doesn't fail if they have already loaded. Thanks @josevalim for the hint. 2011-08-16 19:14:20 +01:00
Xavier Noria
0245792c83 Merge branch 'master' of github.com:lifo/docrails 2011-08-16 11:06:40 -07:00
Xavier Noria
d0d25a9317 prefer ends_with? over slicing 2011-08-16 10:49:20 -07:00
Xavier Noria
53a13083ec AS guide: document in Module#delegate that the method must be public in the target 2011-08-16 10:36:22 -07:00
Jeff Dutil
c5f97b5063 Fix formatting of active_record_validations_callbacks.textile so guide will render properly at http://edgeguides.rubyonrails.org/active_record_validations_callbacks.html#displaying-validation-errors-in-the-view 2011-08-16 13:12:07 -04:00
Jon Leighton
5902391567 Fix assets tests in railties 2011-08-16 16:41:01 +01:00
Jon Leighton
4dd985ae95 Don't reference ActiveRecord::Base in initializers/wrap_parameters.rb. Use config.active_record instead. This yields about a 20% decrease in startup time because it means that the connection is not created immediately on startup. Of course, this is only useful if you are not going to immediately use the database after startup. 2011-08-16 16:40:38 +01:00
Jon Leighton
0d5a6f68df In 1efd88283e, ConnectionAdapters was put under eager_autoload. Due to the requires in that file, this caused ConnectionSpecification to be loaded, which references ActiveRecord::Base, which means the database connection is established. We do not want to connect to the database when Active Record is loaded, only when ActiveRecord::Base is first referenced by the user. 2011-08-16 16:40:16 +01:00
Santiago Pastorino
c6e57467a6 Revert "Merge pull request #2543 from htanata/unused_require_in_ar_test"
This reverts commit 87152f2604, reversing
changes made to 0d3615f04c.
2011-08-16 09:24:49 -03:00
Santiago Pastorino
87152f2604 Merge pull request #2543 from htanata/unused_require_in_ar_test
Remove unused require in activerecord/test/cases/attribute_methods_test.rb
2011-08-16 05:22:27 -07:00
Vijay Dev
bd4800d614 document Array#append and Array#prepend methods in AS guide 2011-08-16 14:57:36 +05:30
Hendy Tanata
21e2eeacff Remove unused require. 2011-08-16 12:40:57 +08:00
Jon Leighton
0d3615f04c Fix tzinfo require (it broke test_raises_when_an_invalid_timezone_is_defined_in_the_config in railties) 2011-08-16 02:42:30 +01:00
Jon Leighton
f76842f57e Fix wrap_parameters initializer template 2011-08-16 02:28:13 +01:00
Jon Leighton
bfb9e61a9f Be more lazy about creating time zone objects. Decreases startup time by about 10%. (#734) 2011-08-16 01:33:34 +01:00
Jon Leighton
6c5f67cac1 Don't refer to ActionController::Base in the wrap_parameters initializer - use config object instead. Cuts about 15% off the load time. (#734) 2011-08-16 00:59:59 +01:00
Sebastian Martinez
308595739c Document Hash#extract!. 2011-08-15 20:20:28 -03:00
Jacob Mattingley
583d7c15c3 Fixed mistakes in layouts/rendering guide about yield
yield(:unspecified_block) actually returns true even if :unspecified_block never
exists. This means you can't use the form yield(:unspecified_block) or yield.
2011-08-15 16:00:53 -07:00
JESii
f7626ea38e Updates to Asset Pipeline Guide
Grammar/syntax/style changes:
1. Changed all 'we' to 'you'
2. Corrected typos
3. Make consistent styline (e.g., dashes & double-dash usage)
4. Change use of future tense (will...) to present tense (easier to read).
2011-08-15 15:17:13 -07:00
Jon Leighton
03a045b306 Bump arel dependency 2011-08-15 23:10:16 +01:00
Jon Leighton
c3dcb795f1 Use new SelectManager#source method 2011-08-15 23:10:16 +01:00