Commit Graph

933 Commits

Author SHA1 Message Date
Benjamin Fleischer
1a7528884c Remove non-ci changes from 2373 2020-02-13 21:17:25 -06:00
Mark J. Lehman
575231503d Trigger travis build 2020-02-13 08:32:14 -08:00
Mark J. Lehman
f6095bbff8 Lock nokogiri for ruby < 2.4 2020-02-11 21:36:03 -08:00
Mark J. Lehman
71d729938b Rejigger gemfile to fix sqlite issue 2020-02-11 21:29:35 -08:00
Mark J. Lehman
89c90b13ea Lock bundler on appveyor 2020-02-11 20:06:58 -08:00
Mark J. Lehman
0a55cee14f Switch travis to openJDK 2020-02-11 20:03:11 -08:00
Mark J. Lehman
be40a5b628 Update Changelog 2020-01-29 13:17:00 -08:00
Mark J. Lehman
5f25aa7cba Fix Rails 6.0 deprecation on class.parent 2020-01-29 13:10:35 -08:00
Benjamin Fleischer
f72ab35d9d Merge pull request #2123 from jeffrey008/patch-2
Fix readme in 0.9
2017-05-10 21:44:48 -05:00
jeffrey008
a3fe031b7d Fix readme in 0.9
There is no `@options` in 0.9, but `@serialization_options` instead. Changed readme to stop confusing people.
2017-05-04 13:24:13 +08:00
Benjamin Fleischer
2eb57af561 Bump to 0.9.7 2017-05-01 11:04:05 -05:00
Benjamin Fleischer
ac3a23f0ca Merge pull request #2106 from jeffrey008/patch-1
FIx the backticks [ci skip]
2017-04-22 21:53:08 -05:00
Benjamin Fleischer
ed72979168 Merge pull request #2080 from yosiat/instrumentation-cleanup
[0.9] Removing `instrumentation_keys` in order to fix the payload
2017-04-21 11:26:33 -05:00
Yosi Attias
9cc4b0531c Adding changelog entry 2017-04-21 19:11:30 +03:00
Yosi Attias
1827588897 Adding tests. 2017-04-21 18:53:16 +03:00
Rafael França
be0b1e8cf9 Merge pull request #2114 from kirs/fix-to-prepare-warning
Fix to_prepare warning
2017-04-18 23:57:22 -04:00
Kir Shatrov
aa7d0ec1c9 Fix to_prepare warning 2017-04-18 21:06:20 -04:00
jeffrey008
7d89e26304 Update README.md 2017-04-13 09:41:51 +08:00
jeffrey008
29166b26b2 FIx the backticks
The backticks are wrong, and making the remaining part of doc inside code block. Just a simple fix to the README.
2017-04-12 17:24:40 +08:00
Yosi Attias
08fd8705f3 extract the instrumentation key to be const and frozen string 2017-03-24 15:16:01 +03:00
Yosi Attias
af410c54e6 Removing instrumentation_keys in order to fix the payload
See - https://github.com/rails-api/active_model_serializers/issues/2067
2017-03-24 14:59:35 +03:00
Benjamin Fleischer
c54532a2ae Merge pull request #2066 from yosiat/benchmarks
[0.9] Benchmarks [ci skip]
2017-03-20 14:56:42 -05:00
Yosi Attias
4fdb4149af Initial benchmarks
Single: DefaultSerializer 26898.121201442846/ips; 76 objects
ArraySerializer 4341.036271334371/ips; 346 objects
ArraySerializer: each_serializer: DefaultSerializer 17288.40932750992/ips; 122 objects
FlatAuthorSerializer 26483.24239241187/ips; 85 objects
ArraySerializer: each_serializer: FlatAuthorSerializer 19398.298446172044/ips; 114 objects
AuthorWithDefaultRelationshipsSerializer 86.69406914259615/ips; 18634 objects
ArraySerializer: each_serializer: AuthorWithDefaultRelationshipsSerializer 80.46248323664165/ips; 20091 objects
2017-03-17 13:44:37 +02:00
Rafael França
1e04d1128b Merge pull request #2079 from dylanahsmith/backport-serializers-cache
Backport caching of the constant lookup
2017-03-15 17:45:47 -04:00
Dylan Thacker-Smith
d58a6e13b0 Move use of serializers cache out of Utils 2017-03-15 17:34:31 -04:00
Dylan Thacker-Smith
d02ee692aa Add explicit dependancy on concurrent-ruby 2017-03-15 17:16:57 -04:00
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