Commit Graph

1657 Commits

Author SHA1 Message Date
Wasif Hossain
838b1737e0
Bump Ruby versions on Travis: 2.4.7/2.5.6/2.6.4
https://www.ruby-lang.org/en/news/2019/08/28/multiple-jquery-vulnerabilities-in-rdoc/
2019-09-03 06:04:17 +06:00
Wasif Hossain
e349395869
Merge pull request #2340 from rails-api/action_dispatch_response_media_type
Configure `ActionDispatch::Response#content_type` behavior on Rails 6+
2019-08-24 01:18:21 +06:00
Wasif Hossain
8a0dad673c
Support jRuby 9.2.8.0 on Travis
https://www.jruby.org/2019/08/12/jruby-9-2-8-0.html
2019-08-24 00:19:41 +06:00
Wasif Hossain
55a6b23cd8
Configure ActionDispatch::Response#content_type behavior on Rails 6+
in order to retain old behavior,
set `config.action_dispatch.return_only_media_type_on_content_type`
to true

it can also be configured by setting
`ActionDispatch::Response.return_only_media_type_on_content_type`
2019-08-23 23:46:29 +06:00
Wasif Hossain
cec9ebab7b
Merge pull request #2354 from rails-api/rails-6-0-rc2
Add support for Rails 6.0.0 on Travis
2019-08-21 23:54:01 +06:00
Wasif Hossain
82ad288fc7
Add support for Rails 6.0.0 on Travis 2019-08-21 22:21:31 +06:00
Wasif Hossain
95f4ead7de
Drop support for Ruby 2.4+ against Rails 4.1 from Travis
https://stackoverflow.com/questions/41504106/ruby-2-4-and-rails-4-stack-level-too-deep-systemstackerror
2019-08-05 03:18:41 +06:00
Wasif Hossain
e981ac6c48
Require jruby 9.1.x (ruby2.3) and 9.2.x (ruby2.5) to pass on Travis
9.1.x should pass against the following rails versions:
- 4.1
- 4.2
- 5.0
- 5.1
- 5.2

9.2.x should pass against the following rails versions:
- 4.2
- 5.0
- 5.1
- 5.2
- 6.0
2019-08-05 02:50:03 +06:00
Wasif Hossain
9db3dd2579
Use specific jdbcsqlite3 version for certain version of rails
https://github.com/jruby/activerecord-jdbc-adapter#activerecord-jdbc-adapter
2019-08-05 01:24:10 +06:00
Wasif Hossain
c907527721
Use openjdk instead of oraclejdk and jruby 9.1/9.2
fa66606a85
2019-08-04 23:57:33 +06:00
Wasif Hossain
6b3eb7444e
Test rails 6.0.0.rc2 on travis 2019-08-01 23:46:35 +06:00
Wasif Hossain
7baf5d5f64
Merge pull request #2348 from rails-api/readme
Update README and CHANGELOG
2019-07-18 20:04:50 +06:00
Wasif Hossain
669c4eebef
Update README and CHANGELOG 2019-07-18 19:31:36 +06:00
Wasif Hossain
7b544f3341
Merge pull request #2344 from rails-api/fieldset-lookup-using-symbol-or-string
Lookup fieldset using either string or symbol
2019-07-17 16:12:34 +06:00
Wasif Hossain
2581fe0362
Lookup fieldset using either string or symbol 2019-07-17 15:51:15 +06:00
Wasif Hossain
433c0c646f
Bump version to 0.10.10 2019-07-13 15:30:49 +06:00
Wasif Hossain
2224cc8b50
Merge pull request #2172 from AyogoHealth/superclass_namespace
Include namespace when looking up superclass
2019-07-11 22:59:32 +06:00
Rafael Gaspar
beffbb2bd3
Follows inheritance with a namespace
Co-authored-by: Rafael Gaspar <rafael.gaspar@me.com>
Co-authored-by: Darryl Pogue <darryl@dpogue.ca>
Co-authored-by: Artin Boghosian <artinboghosian@gmail.com>
2019-07-10 11:41:32 -07:00
Wasif Hossain
777fab04ae
Merge pull request #2337 from InteNs/fix-json-api-belongs-to-fk-on-object
fix incorrect belongs_to serialization when foreign_key on object and belongs_to is blank
2019-06-15 14:50:12 +06:00
Mark Havekes
22849c0399 fix include in failing test 2019-06-14 09:52:16 +02:00
Mark Havekes
4022337966 Revert "lock jsonapi renderer to < 0.2.1"
This reverts commit 58f4f98e41.
2019-06-13 15:49:55 +02:00
Mark Havekes
cee0ad4494 update changelog 2019-06-13 10:52:44 +02:00
Mark Havekes
58f4f98e41 lock jsonapi renderer to < 0.2.1 2019-06-11 23:23:41 +02:00
Mark Havekes
28a172e66a return nil if id is nil 2019-06-11 14:42:13 +02:00
Mark Havekes
4b0c230d76 add failing test and suggestion 2019-06-04 10:27:02 +02:00
Wasif Hossain
339f99fccc
Merge pull request #2334 from sikachu/0-10-stable-relax-rails-version
Allow AMS to run on Rails < 6.1
2019-06-02 09:32:11 +06:00
Prem Sichanugrist
a829bc05b0 Allow AMS to run on Rails 6.0.x 2019-05-31 14:45:14 +09:00
Wasif Hossain
1ff21bac18
Merge pull request #2321 from iggant/0-10-stable
Stick to bundler version < 2
2019-05-02 06:17:21 +06:00
Anton K
4a4a0f263e Stick to bundle < 2 2019-05-01 22:58:09 +03:00
Wasif Hossain
1ebdda331a
Merge pull request #2328 from rails-api/rails-6-rc
Add support for Rails 6.0.0.rc1 on Travis
2019-04-29 20:30:33 +06:00
Wasif Hossain
0f75837f9e
Keep rubygems version < 3.0 until we keep supporting ruby < 2.3 2019-04-29 11:58:08 +06:00
Wasif Hossain
ca43661ac0
Add support for Rails 6.0.0.rc1 on travis 2019-04-29 11:46:20 +06:00
Wasif Hossain
19a6188323
Merge pull request #2304 from greysteil/slim-down-gem
Slim down bundled gem by excluding test files and docs
2019-04-23 21:03:52 +06:00
Grey Baker
14113ba85b Slim down bundled gem by excluding test files and docs 2019-04-23 15:06:40 +01:00
Wasif Hossain
3419a01349
Merge pull request #2223 from rails-api/fields_support_in_all_adapters
Fieldset support in Attributes/JSON adapters
2019-04-23 15:55:43 +06:00
Wasif Hossain
c77fddadd4
Mention current rails version for #2327 ruby2.6/rails4.2 monkeypatch 2019-04-23 15:18:18 +06:00
Wasif Hossain
96303af45f
Add changelog entries for this PR and #2327 2019-04-23 15:14:35 +06:00
Wasif Hossain
807e160b9c
Add missing frozen string literal comment 2019-04-23 04:34:09 +06:00
Wasif Hossain
a9cb097109
Refactoring 2019-04-23 04:34:02 +06:00
Benjamin Fleischer
06fcd34807
Follows https://github.com/rails-api/active_model_serializers/pull/2100 2019-04-23 04:33:56 +06:00
Wasif Hossain
7896ad656a
Merge pull request #2327 from rails-api/ruby-2-6-rails-4-2-test-patch
Add support for Ruby 2.6, configure sqlite3 to use ~> 1.4 for rails 6+, patch for Rails 4.2 against Ruby 2.6
2019-04-23 02:50:47 +06:00
Wasif Hossain
5d122f2922
Fix rubocop offenses 2019-04-23 02:06:12 +06:00
Wasif Hossain
3715a101c2
Refactor travis.yml 2019-04-23 01:51:28 +06:00
Wasif Hossain
0aa1ed93a4
Configure sqlite3 to use ~> 1.4 for rails 6+ 2019-04-22 23:22:28 +06:00
Wasif Hossain
942e10fdb8
Merge pull request #2323 from feliperenan/fix-serializer-link
Fix serializer class link on guides
2019-03-21 22:35:39 +06:00
Felipe Renan
12ccb78fdb Fix serializer class link on guides
The link was pointing out to the master branch instead of the
v-10-stable branch.
2019-03-21 11:41:25 -03:00
Wasif Hossain
6fb4f7b111
Merge pull request #2319 from kylekeesling/rails6
Fix deprecation warnings on Rails 6
2019-03-14 21:51:04 +06:00
Kyle Keesling
912af7ef91
update test fixture schema to use timestamps instead of timestamp
- discovered via @wasifhossain
- Update CHANGELOG.md
2019-03-14 11:00:45 -04:00
Kyle Keesling
6fbeb9a93e
Fix deprecation warnings on Rails 6
takes into account suggestions from @bf4
2019-03-13 09:52:54 -04:00
Benjamin Fleischer
bb0f9d088d Bump version to 0.10.9 2019-02-08 11:25:53 -06:00