github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-26 06:48:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,295 Commits 34 Branches 105 Tags
v2.2.1
Commit Graph

3157 Commits

Author SHA1 Message Date
Michael Koziarski
44c3b865ac Missing changelogs for relative_url_root changes 2008-11-14 16:11:07 +01:00
Michael Koziarski
e4a345c1dc Missing changelog for CSRF changes 2008-11-14 16:11:07 +01:00
Michael Koziarski
16ae82db1e Missing changelog for :only/:except on map.resources 2008-11-14 16:11:07 +01:00
David Heinemeier Hansson
3be853b59d A few more dependency updates 2008-11-14 14:08:26 +01:00
Pratik Naik
c70b993a9e Merge docrails. 2008-11-14 17:47:21 +05:30
David Heinemeier Hansson
c562dfc2a7 Merge branch 'master' of git@github.com:rails/rails 2008-11-14 12:27:08 +01:00
David Heinemeier Hansson
61e43700b8 Prepare for RC2 2008-11-14 12:26:50 +01:00
Tom Stuart
2ecec6052f Make inheritance of map.resources :only/:except options behave more predictably 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-11-14 12:26:43 +01:00
hiroshi
94d6716324 Make polymorphic_url compact given array [#1317 state:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-11-14 12:07:52 +01:00
Hongli Lai (Phusion)
4e9abdd7f1 Tag helper should output an attribute with the value 'false' instead of omitting the attribute, if the associated option is false but not nil. 2008-11-13 21:55:58 +01:00
Tom Stuart
4c09210244 Fix map.resources to always generate named routes if they're needed 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-11-13 17:49:09 +01:00
Michael Koziarski
f1ad8b48aa Instead of overriding html_types, base the verification on browser_generated_types. 
Also Deprecate the old unverifiable types.

[#1145 state:committed]
 2008-11-13 11:23:34 +01:00
rick
00c46b5eeb fix two MimeType failing test cases 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-11-13 11:23:34 +01:00
Jeff Cohen
fbbcd6f29a Changed request forgery protection to only worry about HTML-formatted content requests. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-11-13 11:23:21 +01:00
Tom Stuart
44a3009ff0 Add :only/:except options to map.resources 
This allows people with huge numbers of resource routes to cut down on the memory consumption caused by the generated code.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1215 state:committed]
 2008-11-12 12:57:58 +01:00
Jeremy Kemper
278b6cd952 Eliminate excess Regexp creation due to capture counting 2008-11-10 22:21:09 -08:00
Jeremy Kemper
5db9f9b3ad Pare down object creation during route building 2008-11-10 22:21:09 -08:00
Pratik Naik
5cc27f2b03 Add some basic controller logging tests 2008-11-08 18:45:19 +05:30
Jeremy Kemper
0be5bc3f59 Work around ruby 1.9 segfault 2008-11-07 21:50:39 -05:00
Jeremy Kemper
425382d95f Don't worry about attribute ordering 2008-11-07 21:21:10 -05:00
Jeremy Kemper
07fe3370f8 Check whether last arg is a Hash instead of duck-typing against [] 2008-11-07 21:20:26 -05:00
Jeremy Kemper
aaa2abf73f Use delete if the rhs is nil 2008-11-07 21:19:02 -05:00
Nick Sieger
529c271699 Simplify dispatcher callbacks to eliminate unnecessary stale thread purging. [Nick Sieger, Pratik Naik] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-11-08 03:49:54 +05:30
Rich Manalang
d3ec1d3c22 auto_link view helper was failing on URLs with colons after a query param 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1341 state:committed]
 2008-11-07 19:33:18 +00:00
Aliaksey Kandratsenka
099f10679e Don't eval recognize_optimized use __FILE__ and __LINE__ in the optimised recognition code. 
It produces meaningless line numbers.  This also easily produces line numbers greater than recognition_optimization.rb have, which causes rcov to trash memory outside of it's coverage counting arrays.

[#1319 state:committed]
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-11-06 19:52:44 +00:00
Michael Koziarski
af5b304a40 Fix stupid typo 2008-11-06 18:52:02 +00:00
David Heinemeier Hansson
a358d87e16 Fixed the sanitize helper to avoid double escaping already properly escaped entities [#683 state:committed] 2008-11-06 13:02:32 +01:00
David Heinemeier Hansson
55707da1a1 Dont bother logging the parameters hash if there are no parameters 2008-11-06 09:59:11 +01:00
Vladimir Dobriakov
5fad229e43 Fixed that FormTagHelper generates illegal html if name contains e.g. square brackets [#1238 state:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-11-04 18:24:52 +01:00
Bernardo de Pádua
b2cd318c2e Fix regression bug that made date_select and datetime_select raise a Null Pointer Exception when a nil date/datetime was passed and only month and year were displayed [#1289 state:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-11-04 18:15:54 +01:00
David Heinemeier Hansson
a909eecbbd Dont log the _method attribute either. Its already available in the header 2008-11-04 18:14:29 +01:00
David Heinemeier Hansson
b29f95ed9a Dont log the _method attribute either. Its already available in the header 2008-11-04 18:12:32 +01:00
Pratik Naik
18bf7b421d Remove unused debug_routes 2008-11-02 23:23:19 +05:30
Pratik Naik
934f98e4cf Dont dup params twice when filter_parameters is present 2008-11-02 23:19:44 +05:30
Pratik Naik
be1beb1a2d Dont document internals 2008-11-02 18:36:14 +05:30
Michael Koziarski
8a53e258e5 Backwards compatibility fixes for relative_url_root 
* Make the old deprecated relative_url_root still set the value as it's still used by mongrel
* Set the default from the ENV value when the file is required, not at runtime.
 2008-11-02 13:12:48 +01:00
Pratik Naik
b047929c14 Merge with docrails 2008-11-02 04:02:40 +05:30
Tom Lea
5a02f0bccf Cleaned up route optimisation guard condition generation code as it was getting a little messy. 
Add additional condition to handle the case where default_url_options is only defined in the controller, not the view.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-11-01 19:06:25 +01:00
David Heinemeier Hansson
62ffc6e4db Simplified the logging format for parameters (don't include controller, action, and format as duplicates) [DHH] 2008-11-01 15:46:30 +01:00
Luca Guidi
5229fc4cc0 Make sure habtm use class variable to list association valid keys 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1310 state:committed]
 2008-11-01 15:04:08 +01:00
David Heinemeier Hansson
5110a8e05b Remove the logging of the Session ID when the session store is CookieStore [DHH] 2008-11-01 12:16:15 +01:00
David Heinemeier Hansson
aea7e8c2f3 Accidently nixed a doc header 2008-11-01 12:05:55 +01:00
David Heinemeier Hansson
cbeac93310 Added render :js for people who want to render inline JavaScript replies without using RJS [DHH] 2008-11-01 12:03:49 +01:00
Joshua Peek
2092687bcb Ensure content type gets reset after render_to_string [#1182 state:resolved] 2008-10-30 15:26:29 -05:00
David Heinemeier Hansson
7857e42103 Merge branch 'master' of git@github.com:rails/rails 2008-10-30 21:11:46 +01:00
Seth Fitzsimmons
47b4fa4a62 Fixed regex in redirect_to to fully support URI schemes [#1247 state:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-10-30 21:07:50 +01:00
Joshua Peek
ec38c84ce1 Dup local assigns for partial collections so nil values doesn't get overwritten [#1250 state:resolved] 2008-10-30 15:07:47 -05:00
David Heinemeier Hansson
4dbfe18b37 Proper API for reloading translations 2008-10-29 10:51:56 +01:00
Ryan Bates
4ad5aa9a39 Ensure @content_for_* is checked before yielding to block in render :layout [#8994 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-10-28 17:31:33 -05:00
David Heinemeier Hansson
1df157cd38 Merge branch 'master' of git@github.com:rails/rails 2008-10-28 17:10:52 +01:00