ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-23 14:29:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
467 Commits 15 Branches 40 Tags 5 MiB
5596eab65f
Commit Graph

467 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Liz Abinante
5596eab65f add unreleased documentation updates 2016-02-12 05:24:15 -08:00
Liz Abinante
5c2e61bcfb [0.8.x] add example for POROs, clear up explanation 2016-02-09 04:12:46 -08:00
Benjamin Fleischer
7e2051a369 Merge pull request #1376 from bf4/fix_ci 
Fix CI
 2015-12-15 10:16:38 -06:00
Benjamin Fleischer
75252a2ef9 Run CI against Rails >= 4.0, Ruby >= 1.9.3 2015-12-14 21:59:08 -06:00
Benjamin Fleischer
d03b8179f5 Adjust test for Rails versions that address CVE-2014-4671 
Compare
https://github.com/rails/rails/blob/3-2-stable/actionpack/lib/action_controller/metal/renderers.rb#L94
to
https://github.com/rails/rails/blob/4-0-stable/actionpack/lib/action_controller/metal/renderers.rb#L97
 2015-12-14 21:51:31 -06:00
mhuggins
b05d9dbd36 Add appveyor.yml 2015-12-14 21:48:27 -06:00
mhuggins
66caef5a0c Remove Ruby 1.8 and 1.9.2 support 2015-12-14 21:48:27 -06:00
mhuggins
e1ae39122c Fix failing tests 2015-12-14 21:48:27 -06:00
Steve Klabnik
8d31f7ee8c Bump to 0.8.3 2014-12-10 09:45:29 -05:00
Steve Klabnik
b6b01d0b73 Merge pull request #663 from wouterw/ww-fix-super-in-define-method 
Fix use of `super` in `define_method`
 2014-09-23 09:16:58 -04:00
Wouter Willaert
d5226e5978 Fix use of super in define_method 2014-09-21 23:34:44 +02:00
Steve Klabnik
d996d136e4 Merge pull request #644 from tricknotes/fix-0.8-tests 
Fix to run 0.8-stable's tests
 2014-09-20 17:46:30 -04:00
Steve Klabnik
a65e86bb52 Merge pull request #655 from wouterw/ww-rails-4.2.0 
Fix Rails Master
 2014-09-19 12:37:50 -04:00
Wouter Willaert
9ebd317898 Remove usage of %i 2014-09-19 17:13:25 +02:00
Wouter Willaert
18667712ea Support both the _render_option_json and the newer _render_with_renderer_json methods 2014-09-19 10:30:59 +02:00
Ryunosuke SATO
f77362e9d6 Disabled protect_from_forgery 
Because of the following error:
```
ActionController::InvalidCrossOriginRequest: Security warning: an
embedded <script> tag on another site requested protected JavaScript. If
you know what you're doing, go ahead and disable forgery protection on
this action to permit cross-origin JavaScript embedding.
```
 2014-09-08 19:09:07 +09:00
Ryunosuke SATO
bb8bedad63 Fix to run tests 2014-09-08 19:04:29 +09:00
Steve Klabnik
66d39b6c0a bump version 2014-09-01 17:00:39 -04:00
Steve Klabnik
1db474963b Remove coveralls. 
It's fine, but it's causing issues.
 2014-07-04 23:01:26 -04:00
Steve Klabnik
c7d8145773 Fix rbx in .travis.yml 2014-07-04 22:59:42 -04:00
Steve Klabnik
d8f59f2e94 Merge pull request #538 from mayhewluke/fix-array-output 
Fix ArraySerializer's output when falling back on DefaultSerializer
 2014-07-04 19:09:18 -07:00
Luke Mayhew
cfcd712123 Fix ArraySerializer's output when falling back on DefaultSerializer 
Change ArraySerializer's initialization of DefaultSerializer to pass
:root => false in order to avoid adding root keys to each of the
items in the array. This ensures consistent results between serializing
arrays of objects with serializers and arrays of objects without
serializers. Fixes #495.
 2014-04-01 22:38:58 -06:00
Rafael Mendonça França
76fe4e754c Merge pull request #536 from icem/patch-1 
Fix type in Readme
 2014-03-31 13:14:16 -05:00
Yury Otcheski
acfa17ecc7 Fix type in Readme 
proof https://github.com/rails-api/active_model_serializers/blob/0-8-stable/test/serializer_support_test.rb
 2014-03-31 21:10:32 +03:00
Santiago Pastorino
a9e7319c7b Merge pull request #477 from gtd/fix-as-json-with-nil 
Allow serializer#as_json to be called with nil
 2013-12-30 11:50:11 -08:00
Gabe da Silveira
36d92804ed Fix serializer.as_json(nil) 
This is the form that ActiveSupport 3.1 Object#to_json invokes.
 2013-12-30 12:36:18 -06:00
steveklabnik
e81406a248 Revert "First part of a fix for #208." 
This reverts commit 145b6d499d.

This fix introduced an incompatibility with Rails 3.0.

We'll have to fix it in a different way for older Rails.
 2013-05-29 23:25:00 +00:00
Steve Klabnik
731528e1f6 Merge pull request #305 from dv/patch-2 
Clarify disabling root for ArraySerializers
 2013-05-21 08:36:20 -07:00
David Verhasselt
2cc598c74a Update README.md 
Setting AMS::Serializer.root = false doesn't automatically disable root for the ArraySerializer.
 2013-05-21 12:00:39 +03:00
Steve Klabnik
1c4f3a70da Merge pull request #301 from dv/patch-1 
Update README.md
 2013-05-14 14:39:10 -07:00
David Verhasselt
1614ef3b12 Create new section 'Disabling root' in README 2013-05-14 11:30:22 +03:00
David Verhasselt
358b6a8875 Update README.md 2013-05-14 10:42:28 +03:00
David Verhasselt
5504293776 Update README.md 
I'm a bit embarrassed to admit that it took me a while to figure out this was a possibility, so I figured maybe this change will save some other poor chaps their time and/or pride.
 2013-05-13 18:23:20 +03:00
Steve Klabnik
8b7e9d32d7 Merge pull request #299 from vanstee/bump-version-in-readme 
Bump minor version specified in Gemfile
 2013-05-11 08:14:08 -07:00
vanstee
6b6afb8a83 Bump minor version specified in Gemfile 2013-05-11 02:33:27 -04:00
Rafael Mendonça França
e6e1b3feaa Merge pull request #297 from thetamind/patch-1 
Fix code formatting in changelog
 2013-05-08 12:38:36 -07:00
Matt Boehlig
2e0bee0c56 Fix code formatting in changelog 
A code block example was not markdown formatted as code.
 2013-05-08 14:34:16 -05:00
Steve Klabnik
fe84e0ad52 version bump 0.8.1 2013-05-05 17:35:51 -07:00
Steve Klabnik
c2f7af26f1 CHANGELOG for 0.8.1 2013-05-05 17:35:28 -07:00
Steve Klabnik
9c8ef8006b Merge pull request #295 from SamSaffron/master 
Allow serializers to implement options
 2013-05-05 17:34:17 -07:00
Sam
597a2e3148 allow serializers to implement an options attribute 2013-05-06 10:30:46 +10:00
Steve Klabnik
a022d464f5 Bump to 0.8.0 2013-05-05 13:45:50 -07:00
Steve Klabnik
48e5ca29f1 Add Coveralls for code coverage. 2013-05-05 13:38:56 -07:00
Steve Klabnik
92a165b545 Update CHANGELOG for 0.8.0 2013-05-05 13:20:24 -07:00
Steve Klabnik
a0b07259ae Add CodeClimate badge. 2013-05-05 13:04:39 -07:00
Steve Klabnik
bb8900e308 Merge pull request #264 from vad4msiu/features/root_element 
Support for setting root element
 2013-05-05 12:02:27 -07:00
Steve Klabnik
cffdbce072 Merge pull request #283 from morgoth/add-only-and-except-options-support 
Add only and except options support
 2013-05-05 12:00:59 -07:00
Steve Klabnik
da779c259f Merge pull request #293 from goshakkk/mongoid-support 
add support of mongoid collection serialization
 2013-05-05 12:00:04 -07:00
Steve Klabnik
d87f10a6da Merge pull request #294 from goshakkk/has-one 
allow singular embed when serializing association
 2013-05-05 11:58:50 -07:00
Gosha Arinich
1482081766 add support of mongoid collection serialization 2013-05-05 21:50:34 +03:00