ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-23 06:16:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
426 Commits 15 Branches 40 Tags 5 MiB
a022d464f5
Commit Graph

426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jo Liss
bea38dd73a Update RELEASE_NOTES 2012-09-23 15:08:39 +02:00
Jo Liss
3c5e58bf13 Merge pull request #129 from dgeb/active-record-init 
clean up lazy loading of serialization support
 2012-09-21 11:34:30 -07:00
Jo Liss
0a5d3eb953 Fix assertion for Ruby 1.8.7 2012-09-21 16:57:51 +02:00
Jo Liss
646d57c438 Make test suite compatible with Rails 4 
Rails 4 changes the JSONP content_type to text/javascript
 2012-09-21 16:36:42 +02:00
Jo Liss
dfcbc59061 Merge pull request #131 from dgeb/travis-bundler-install 
Ensure bundler is updated for travis testing of edge rails
 2012-09-21 05:22:02 -07:00
Dan Gebhardt
2d7bbaa3a6 Ensure bundler is updated for travis testing of edge rails 2012-09-21 08:14:56 -04:00
Jo Liss
dcd14e13f1 Merge pull request #130 from dgeb/edge-rails-travis 
Add edge rails to the Travis test matrix
 2012-09-20 21:12:02 -07:00
Dan Gebhardt
0caca174e6 added edge rails on 1.9.3 to the test matrix (with failures allowed) 2012-09-20 21:38:19 -04:00
Dan Gebhardt
281b45ad2a match method should not be used for routes; instead, a specific HTTP method should be used 2012-09-20 21:17:07 -04:00
Dan Gebhardt
506e2ac9ad clean up lazy loading of serialization support for ActiveRecord::Base and ActionController::Base 2012-09-20 14:23:59 -04:00
Jo Liss
b706244122 Merge pull request #128 from dgeb/rails3+ 
compatibility with rails >= 3.0
 2012-09-19 11:16:24 -07:00
Dan Gebhardt
a8eb21d87d compatibility with rails >= 3.0 2012-09-19 13:01:18 -04:00
Tee Parham
9584b9e147 move OrderedSet to separate file 2012-09-18 01:28:07 +02:00
Tee Parham
b8f01ba2f3 move ArraySerializer to separate file 2012-09-18 01:28:07 +02:00
Yehuda Katz
f9117072fb Describe undesirable but necessary cruft 2012-09-16 20:36:02 -07:00
Yehuda Katz
2130cdfc00 List out the event names to avoid garbage 2012-09-16 20:20:34 -07:00
Yehuda Katz
a025f1b6f6 Eliminate some String garbage 2012-09-16 20:08:30 -07:00
Yehuda Katz
9da0176d2b Merge branch 'master' of github.com:josevalim/active_model_serializers 2012-09-16 19:46:17 -07:00
Jo Liss
afc3beef16 Merge pull request #122 from oriolgual/patch-1 
Document how to embed ids or objects per association
 2012-09-12 14:23:50 -07:00
Jo Liss
8f1b33aad0 Merge pull request #116 from anathematic/patch-1 
Added homepage in Gemspec
 2012-09-12 14:21:50 -07:00
Jo Liss
98c58b47f1 Merge pull request #118 from teeparham/dev_gemspec 
move development gem dependencies into gemspec
 2012-09-12 14:21:20 -07:00
Yehuda Katz
a21529370c Merge pull request #123 from dgeb/conditional-includes 
Conditional includes (closes #111)
 2012-09-02 21:56:38 -07:00
Yehuda Katz
84f8c1c3d5 Merge branch 'master' of github.com:josevalim/active_model_serializers 2012-09-02 21:21:05 -07:00
Dan Gebhardt
7fc8606101 documentation of conditional include options for serializers 2012-08-29 10:54:56 -04:00
Dan Gebhardt
42221a6140 define include_XXX? methods, which can be overridden to conditionally include attributes and associations 2012-08-29 09:26:41 -04:00
Dan Gebhardt
68dc57eb73 simplified the API for include_associations!() to make conditional includes cleaner 2012-08-29 07:42:23 -04:00
Oriol Gual
027f1580dc Document how to embed ids or objects per association 2012-08-27 11:51:16 +03:00
José Valim
001c1d0634 Merge pull request #121 from twinturbo/polymorphic-update 
Easier to work with polymorphic interface
 2012-08-25 09:43:38 -07:00
twinturbo
38859d1f3d Easier to work with polymorphic interface 2012-08-25 17:39:39 +02:00
Tee Parham
caf2daaa60 move development gem dependencies into gemspec 2012-08-23 21:13:16 -06:00
Thomas
4b429c1f6e Added homepage in Gemspec 2012-08-16 12:11:36 +10:00
José Valim
655c4fe1c2 Merge pull request #110 from pivotal-medici/fix_default_url_options 
Return empty hash when url_options not provided
 2012-08-07 10:22:05 -07:00
Alex Kwiatkowski & Will Bagby
754aa295ba Return empty hash when url_options not provided 2012-08-07 12:56:58 -04:00
José Valim
dd5cdb6ddb Merge pull request #106 from raycohen/scope_option_precedence 
Scope option precedence
 2012-07-29 03:06:47 -07:00
Ray Cohen
424dacb457 scope option to render takes precedence over serialization_scope 2012-07-28 21:06:15 -04:00
Ray Cohen
1e7c69c729 Test for having scope option to render override the controller's serialization scope 2012-07-28 19:05:45 -04:00
José Valim
21817bc795 Merge pull request #105 from raycohen/readme-fix-custom-attributes 
fix custom attributes with scope readme section
 2012-07-28 10:21:39 -07:00
Ray Cohen
63465fda68 fix custom attributes with scope readme section 2012-07-28 13:01:06 -04:00
José Valim
dbde02d647 Merge pull request #103 from joliss/cleanup 
Use blocks instead of eval to define methods
 2012-07-25 23:34:29 -07:00
Jo Liss
e8f2ecebfb Use blocks instead of eval to define methods 2012-07-26 00:28:59 +02:00
José Valim
3f75c14267 Merge pull request #101 from teeparham/patch-1 
fix typo in README
 2012-07-24 00:57:46 -07:00
Tee Parham
6a37cfe219 fix typo in README 2012-07-23 14:07:49 -06:00
José Valim
ff7c6adb58 Merge pull request #100 from teeparham/readme-arrays 
Add section on Arrays to README
 2012-07-23 12:14:59 -07:00
Tee Parham
663d443884 Merge branch 'array-serializer-root' of github.com:teeparham/active_model_serializers into readme-arrays 2012-07-23 13:02:04 -06:00
Tee Parham
3ecf22a249 more README markdown cleanup 2012-07-23 12:55:47 -06:00
Tee Parham
f8263153b6 cleanup markdown in docs 2012-07-23 12:49:02 -06:00
Tee Parham
53da0b12fd add docs for serializing arrays 2012-07-21 15:25:41 -07:00
Tee Parham
bf2fa2d31c add docs for custom serializers 2012-07-21 15:25:08 -07:00
José Valim
b813646076 assert_include is not available before 1.9 2012-07-21 10:01:27 +02:00
José Valim
77b873a9a4 Update release notes for upcoming release 2012-07-21 09:52:39 +02:00