Commit Graph

907 Commits

Author SHA1 Message Date
Dylan Thacker-Smith
039e6eac34 Backport caching of the constant lookup 2017-03-15 16:45:48 -04:00
Benjamin Fleischer
c2565ed726 Merge pull request #2071 from rails-api/fix_ci
Nokogiri 1.7 removes support for Rubies < 2.1
2017-03-14 20:46:37 -05:00
Benjamin Fleischer
02f2f864a4 Exclude 2.0 form 5.0; update deps 2017-03-12 16:29:29 -05:00
Benjamin Fleischer
1b89a4b4de Update travis.yml based on master 2017-03-12 15:32:59 -05:00
Benjamin Fleischer
9174e7ef20 RBX is very hard to keep passing on CI 2017-03-12 15:22:41 -05:00
Benjamin Fleischer
459a51f9b8 Nokogiri 1.7 removes support for Rubies < 2.1
See
8487038184
2017-03-12 15:09:30 -05:00
Benjamin Fleischer
32704cb0c1 Bump to 0.9.6 2017-01-10 16:23:05 -06:00
Rafael França
4432257cb8 Merge pull request #2008 from kirs/patch-2
Fix warning on Thor
2016-12-19 13:54:55 -05:00
Kir Shatrov
96f6be92e8 Fix warning on Thor
The default argument type for Thor is `string`. Unless it's specified that we pass `boolean`, we get the warning:

`Expected string default value for '--serializer'; got true (boolean)`

Details: 605897b5a0
2016-12-19 13:45:49 -05:00
Vinod Lala
b1495a1560 Fix doc for meta_key (#1869) 2016-08-03 11:13:11 -05:00
Benjamin Fleischer
4ce4a6265c Bump to 0.9.5 2016-03-30 14:09:00 -05:00
Yohan Robert
ae3cf18d0f Merge pull request #1607 from Hirtenknogger/merge-multiple-nested-associations
Merge multiple nested associations
2016-03-30 14:32:27 +02:00
Jan Wendt
a30f53de76 merge multiple nested associations 2016-03-30 08:39:40 +02:00
Benjamin Fleischer
a105c603c4 Merge pull request #1424 from willnet/patch-1
Fix typo on Changelog
2016-01-11 20:21:13 -06:00
Shinichi Maeshima
b6bca2b42e Fix typo on Changelog
😃
2016-01-12 10:55:38 +09:00
Benjamin Fleischer
827fca098d Bump to 0.9.4 2016-01-05 13:26:16 -06:00
Benjamin Fleischer
ade4a77b8e Update Changelog from 0-9-stable (HEAD)
Use
github-changes --owner rails-api --repository active_model_serializers
--branch 0-9-stable --tag-name v0.9.4 --file CHANGELOG.new.md
--date-format "YYYY-MM-DD HH:mm Z" --use-commit-body --only-pulls

but something's not quite right with how it identifies the tag
2016-01-05 13:24:53 -06:00
Benjamin Fleischer
f3955ef346 Update ChangeLog to 0-9-stable (from 0.10 master) 2016-01-05 13:02:57 -06:00
Benjamin Fleischer
1e4eaa1562 Merge pull request #1345 from anduong/update_document_for_attribute_method_in_09x_version
Update alias attribute in Readme.md of 0.9.x version
2015-12-08 22:25:16 -06:00
An Duong
8c29719cff - Update Readme.md
+ Add ‘Alias Attribute’ anchor link to reference backward from version 0.10.x
2015-11-25 22:13:43 +07:00
Alexandre de Oliveira
dc08f0ec80 Merge pull request #748 from raphaelpereira/0-9-stable
Propagate serialization_options across associations
2015-03-30 16:31:41 -03:00
Raphael Pereira
fd5cd879f8 Added test case for association propagating options 2015-03-28 13:24:03 -03:00
Josh Smith
fe240d5755 Merge pull request #841 from antstorm/fix-embed-in-root-key-issue
Fix issue with embedding multiple associations under the same root key
2015-03-22 17:38:22 -07:00
Anthony Dmitriyev
d62463de15 Fix issue with embedding multiple associations under the same root key 2015-03-13 17:24:54 +00:00
Alexandre de Oliveira
55210ab61f Merge pull request #813 from jtomaszewski/feature/custom-serializer-class
Allow to define custom serializer for given class
2015-03-09 11:43:53 -03:00
Jacek Tomaszewski
d8b78a36cf Allow to define custom serializer for given class
.. by defining #serializer_class method in serialized object's class. Resolves #515.
2015-03-08 14:58:29 +01:00
Alexandre de Oliveira
1a7395b1d1 Merge pull request #797 from afn/0-9-stable
Fix and test for #490
2015-03-01 08:54:00 -05:00
Tony Novak
263b66e423 Fix and test for #490 2015-01-30 13:49:15 -08:00
Alexandre de Oliveira
f71ac766ef Merge pull request #790 from engineyard/array-serializer-context
pass context to ArraySerializer
2015-01-29 15:05:57 -02:00
Josh Lane
e0690862ce test array serializer context 2015-01-28 11:38:54 -08:00
Josh Lane
0e7cae4d6d pass context to ArraySerializer 2015-01-27 11:37:35 -08:00
Alexandre de Oliveira
69aff2a2e8 Merge branch '0-9-1' into 0-9-stable
This will bring back all features in 0.9.1 minus the problematic
Enumerable commit that broke it.
2015-01-21 22:01:14 -02:00
Alexandre de Oliveira
02c6ac96b0 Bump version to 0.9.3 2015-01-21 18:29:38 -02:00
Alexandre de Oliveira
c49baec356 Merge pull request #776 from nateberkopec/0-9-1
Revert #665
2015-01-21 18:13:40 -02:00
Nate Berkopec
577db35824 Revert "Make sure render json: ..., each_serializer: ... is working with Enumerables"
This reverts commit 90343cea4d.
2015-01-13 17:12:02 -05:00
Alexandre de Oliveira
3baff109eb Merge pull request #717 from r-ideas/0-9-stable
fixed issue with rendering Hash which appears in rails 4.2.0.beta4
2015-01-06 09:34:03 -02:00
Alexandre de Oliveira
64cc5385bc Merge pull request #749 from shwoodard/whitespace-fix
remove trailing whitespace
2014-12-09 14:20:36 -02:00
Steve Klabnik
9953a60c92 Merge pull request #752 from basiam/0-9-stable
Tiny improvement of README 0-9-stable
2014-12-09 10:59:57 -05:00
Basia Madej
3b2788fc4f Tiny improvement of README 0.90 syntax 2014-12-09 16:07:14 +01:00
Sam Woodard
69315a25a5 remove trailing whitespace 2014-12-07 08:45:32 -08:00
Raphael Pereira
db566b427d serialization_options propagation - test correction 2014-12-06 09:50:42 -02:00
Raphael Pereira
ea6dc424ee Propagate serialization_options across associations 2014-12-06 09:25:30 -02:00
Steve Klabnik
f1c3268a54 bump version 2014-12-04 06:54:52 -05:00
Alexandre de Oliveira
23c2e678ed Fixes rbx gems bundling on TravisCI
Conflicts:
	.travis.yml
2014-11-06 19:24:32 +02:00
Alexandre de Oliveira
42010cc8e8 Merge pull request #660 from kbullaughey/standardize_has_one_and_has_many_on_string_roots
Standardize has one and has many on string roots
2014-11-06 14:53:37 -02:00
Roman Greshny
4b49d1b132 fixed issue with rendering Hash which appears in rails 4.2.0.beta4 2014-11-05 16:34:08 +02:00
Steve Klabnik
cd1829d0c0 Merge pull request #694 from joaomdmoura/0-9-stable
Fixing README at 0.9.0 by removing reference to attribute method #657
2014-10-24 07:05:46 -04:00
Joao Moura
6fb6162622 Fixing README at 0.9.0 and removing reference to attribute method #657 2014-10-23 18:22:21 -02:00
Kevin Bullaughey
edfd38bdee converted has many to use string key for association, makeing it compatable with has_one; fixed tests that relied on symbol keys for has_many associations 2014-10-22 10:33:11 -04:00
Kevin Bullaughey
34d684ee9a added failing spec to show how both symbol and string keys are causing problems 2014-10-22 10:31:18 -04:00