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
25,603 Commits 34 Branches 105 Tags
322f47898e80af3fcdc3cb3db35e177d8216a2d2
Commit Graph

25603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jose and Yehuda
322f47898e Add association_ids 2011-10-15 18:40:38 +02:00
Jose and Yehuda
22c322f056 Add support for overriding associations, mostly used for authorization 2011-10-15 18:40:38 +02:00
Jose and Yehuda
776da539d7 Add support for implicit serializers 2011-10-15 18:40:38 +02:00
Jose and Yehuda
2a4aaae72a Added has_one and has_many 2011-10-15 18:40:37 +02:00
Jose and Yehuda
598fc578fb Don't unnecessarily use String eval. 2011-10-15 18:40:37 +02:00
Jose and Yehuda
e407dfb9bf Don't require serializable_hash to take options. 2011-10-15 18:40:37 +02:00
Vijay Dev
f5836543c3 minor edits in serializers guide 2011-10-15 18:40:37 +02:00
Jose and Yehuda
c3de52d7ed Initial implementation of ActiveModel::Serializer 2011-10-15 18:40:37 +02:00
Jose and Yehuda
a4c04a43cc Refactor to make renderers a Set 2011-10-15 18:40:37 +02:00
Jose and Yehuda
8ff7693a8d Initial commit of serializer support 2011-10-15 18:40:37 +02:00
José Valim
098c95abcb Merge pull request #3320 from sunaku/space-align 
fix inconsistent alignment in Gemfile generator
 2011-10-15 01:56:30 -07:00
Vijay Dev
e759c8882a Merge branch 'master' of github.com:lifo/docrails 2011-10-14 22:21:40 +05:30
José Valim
521a089166 Merge pull request #3331 from fabrik42/master 
Include affected record when raising an ActiveRecord::StaleObjectError
 2011-10-14 09:42:03 -07:00
Christian Bäuerlein
c6f0461e89 Consider attempted action in exception message of ActiveRecord::StaleObjectError 2011-10-14 18:20:41 +02:00
Christian Bäuerlein
410fa4cf7c Includes stale record in StaleObjectError 2011-10-14 16:28:02 +02:00
Vijay Dev
e2a3952428 Merge pull request #72 from pote/master 
small fix
 2011-10-14 03:08:08 -07:00
Ryan Bigg
6df79bf580 [engines guide] WIP for explaining how to hook engine into application 2011-10-14 18:44:39 +11:00
Ryan Bigg
aae77d2839 [engines guide] complete comments resource generation 2011-10-14 18:44:39 +11:00
Ryan Bigg
3d192c7385 [engines guide] Add heading for comments 2011-10-14 18:44:39 +11:00
Ryan Bigg
2c8b8ce9ee [engines guide] make clear that the comment generator command is just one line 2011-10-14 18:44:39 +11:00
Ryan Bigg
2101bc9fd0 [engines guide] make it clear that the scaffold generator output isn't part of the actual command 2011-10-14 18:44:39 +11:00
Ryan Bigg
690dd2f64c [engines guide] correct render line is blorgh/comments/form 2011-10-14 18:44:39 +11:00
Ryan Bigg
411613ab20 [engines guide] improve wording for sentence describing comments/form partial 2011-10-14 18:44:38 +11:00
Jeremy Kemper
401d00d296 Symbol captures may generate multiple path segments, so don't escape / -> %2F. Test splat escaping. 2011-10-13 21:42:15 -07:00
Jeremy Kemper
bceec4c3c3 / is allowed in URI fragments 2011-10-13 21:41:30 -07:00
Jeremy Kemper
ec37160664 Leave escaping up to Journey 2011-10-13 21:40:42 -07:00
Jeremy Kemper
45ced7e1be Failing tests for path parameter escaping 2011-10-13 19:02:58 -07:00
PoTe
dadfa1e34f security reasonS should be plural 2011-10-13 22:31:32 -02:00
Santiago Pastorino
a5b0f914f1 Merge pull request #3314 from macmartine/master 
Remove user-specified delimiter from start when no area code is present (in number_to_phone)
 2011-10-13 16:26:55 -07:00
Jeremy Kemper
8cbe826958 Rails 4 is just around the corner. Stuck with 1.8 until then. 2011-10-13 16:11:00 -07:00
Jeremy Kemper
0a9b6de4d2 Tests gotta run in 1.8 too 2011-10-13 15:54:53 -07:00
Santiago Pastorino
df5ea6b8b1 Merge pull request #2224 from kommen/fix_fragment_caching_for_master 
Fix fragment cache helper regression on cache miss introduced with 03d01e
 2011-10-13 15:48:49 -07:00
Suraj N. Kurapati
d32a90b9b7 fix inconsistent alignment in Gemfile generator 2011-10-13 15:36:50 -07:00
David Heinemeier Hansson
85b64f98d1 Added ActiveRecord::Base.store for declaring simple single-column key/value stores [DHH] 2011-10-13 16:24:22 -05:00
Santiago Pastorino
8f11d53506 Merge pull request #2219 from kommen/fix_fragment_caching_squashed 
Fix fragment caching (squashed commits)
 2011-10-13 13:36:20 -07:00
Diego Carrion
b7cccae71e improved ActiveResource's .element_path and .new_element_path methods documentation by specifing how .site should be declared in order to use prefix_options 2011-10-13 16:27:10 -03:00
José Valim
74fbbf1ea0 Merge pull request #3315 from rahul100885/rahul100885_workspace 
Added test to check that the vendor/assets/stylesheets directory is creat
 2011-10-13 01:04:42 -07:00
Ryan Bigg
66b2dc059f [engines guide] don't show actual timestamp in migration generation 2011-10-13 18:06:00 +11:00
Ryan Bigg
e537a3fcb1 [engines guide] change comments resource generation 
Totally didn't like where this section was going, so scrapped it.

Scaffold is great for some things (lol) but nested resources is definitely not one of them.

Best to walk people through how to do it right, as they would in the real world
 2011-10-13 18:06:00 +11:00
Rahul Chaudhari
dc3f33eb60 Added test to check that the vendor/assets/stylesheets directory is created 2011-10-13 12:17:19 +05:30
Mac Martine
20728f551c remove user-specified delimiter from start when no area code is present (in number_to_phone) 2011-10-12 17:06:44 -07:00
Vijay Dev
e6b2e7fbea refactor guide example 2011-10-13 02:17:01 +05:30
José Valim
f6c9349565 Merge pull request #3287 from sgerrand/vendor_assets_javascripts_should_be_created 
Ensure that the directory 'vendor/assets/javascripts' is created by AppGenerator
 2011-10-12 11:37:09 -07:00
Steve Bourne
e552fe16d4 change activerecord query conditions example to avoid 'type' as column name 
'Type' is a reserved column for STI.  Changed conditions example to
avoid using that column name as an example.  The example isn't
STI-related (and mentioning STI here is needless clutter), so changing
to avoid accidentally encouraging users to use 'type' as a column name
for other purposes.
 2011-10-12 10:46:08 -07:00
Craig Monson
532e6d59b5 quoting 'and' to make it more distinct. 2011-10-12 10:34:27 -04:00
José Valim
2cb2ca68b1 Add some implementation docs. closes #3298. closes #2509. 2011-10-12 09:29:40 +02:00
Akira Matsuda
4a025f0080 status is a number in Rails 3 2011-10-12 15:44:19 +09:00
Jeremy Kemper
e5d0bb22ef Fix version number in CHANGELOG 2011-10-11 21:03:08 -07:00
Jeremy Kemper
b8bb5f44c8 Treat 303 See Other as a redirect response, too 2011-10-11 21:01:11 -07:00
Jeremy Kemper
027ecd3afb Merge remote-tracking branch 'jimherz/activeresource_redirection_patch' 
Closes #3302
 2011-10-11 20:54:06 -07:00