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
24,708 Commits 34 Branches 105 Tags
db181bddb646ff22c85218072ba5c69ca680dabd
Commit Graph

24708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Schierbeck
db181bddb6 Refactor Sprockets::Helpers::RailsHelper#performing_caching? 
No need for them lines to get so long! Also, move that comment into
the method body where it belongs!
 2011-08-22 16:50:33 +02:00
Aaron Patterson
aae5ebf3eb Merge pull request #2618 from FLOChip/unicode_j 
fix escape_javascript for unicode character \u2028.
 2011-08-21 18:42:17 -07:00
Santiago Pastorino
35c8a896fc Merge pull request #2620 from cesario/3-1-0 
Fix CI and rename 1 misleading test case.
 2011-08-21 19:59:09 -03:00
Joshua Peek
63d3809e31 Fix sprockets warnings 
Fixes #2598
 2011-08-21 16:42:06 -05:00
Teng Siong Ong
f6ceb944ea fix escape_javascript for unicode character \u2028. 2011-08-21 15:14:45 -05:00
Xavier Noria
f25d65d2fb Merge pull request #2610 from asmega/documentation 
added link to url_for in documentation
 2011-08-21 09:17:47 -07:00
asmega
ebe9155313 Use typewriter styling on url_for in documentation 2011-08-21 16:40:56 +01:00
Santiago Pastorino
83b91c1fd4 Merge pull request #2609 from guilleiguaran/bump-sprockets-beta14 
Bump sprockets to 2.0.0.beta.14
 2011-08-21 07:36:02 -07:00
Xavier Noria
74b57b387f Merge pull request #2600 from al/finder_sql_example_update 
Updated the docs for the has_many :finder_sql option
 2011-08-21 04:36:12 -07:00
Guillermo Iguaran
f71c481545 Bump sprockets to 2.0.0.beta.14 2011-08-20 17:10:45 -05:00
Santiago Pastorino
165fb830d0 Merge pull request #2596 from dharmatech/patch-1 
ActionController::Redirecting : fix docs typo
 2011-08-20 14:16:15 -07:00
Santiago Pastorino
1299640ea5 Merge pull request #2595 from smartinez87/assets-guide 
Document debugging assets set by default for dev and test envs on guides
 2011-08-20 14:15:47 -07:00
Santiago Pastorino
71ef72c3d0 Merge pull request #2597 from dharmatech/patch-2 
actionpack/lib/action_controller/base.rb: docs typo
 2011-08-20 14:14:54 -07: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
Alan Larkin
dbe9a9b482 Updated the docs for the has_many :finder_sql option to reflect changes made in #a7e19b30ca71f62af516, i.e. the use of Procs when interpolation of the SQL is required. 2011-08-20 19:42:07 +01: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
dharmatech
dfd03fdbd3 actionpack/lib/action_controller/base.rb: docs typo 2011-08-20 00:17:44 -05:00
dharmatech
31d38d37d3 ActionController::Redirecting : fix docs typo 2011-08-20 00:07:34 -05:00
Sebastian Martinez
0b3b91cdcd Document debugging assets set by default for dev and test envs in the asset_pipeline guide. 2011-08-19 19:45:55 -03: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