Commit Graph

  • fae99ee08a
    Merge pull request #2428 from jpawlyn/0-10-stable 0-10-stable Wasif Hossain 2022-01-03 22:56:39 +0600
  • c91c7892dc Add ruby 3.1 and rails 7.0 to ci matrix Jolyon Pawlyn 2021-12-28 20:26:01 +0000
  • 169d210187 Make Rails 7 hack specific to test controller that needs it Jolyon Pawlyn 2021-12-28 09:08:06 +0000
  • 5d64851ad0 Prevent the clearing of instance variables after each test request with Rails 7 Jolyon Pawlyn 2021-12-16 15:15:40 +0200
  • c1acc24b31 Rollback redundant travis change Jolyon Pawlyn 2021-12-16 13:01:15 +0200
  • b6d2c8f048 Action review comments Jolyon Pawlyn 2021-12-16 12:59:14 +0200
  • ba2ee99a7c Relax gem requirement to allow Rails 7 Jolyon Pawlyn 2021-12-16 09:15:31 +0200
  • 669b0a3347
    Merge pull request #2423 from sikachu/0-10-stable-relax-rails Wasif Hossain 2021-07-12 16:19:44 +0600
  • 9a78a78b72 Relax gem requirement for Rails 7.0 prerelease Prem Sichanugrist 2021-07-12 18:48:42 +0900
  • 01c0d69560
    Merge pull request #2412 from tashirosota/v0.10/add_raise_cannot_infer_root_key_error_option Wasif Hossain 2021-03-03 12:54:37 +0600
  • 7a80f98e2d
    Merge branch '0-10-stable' into v0.10/add_raise_cannot_infer_root_key_error_option tashiro 2021-02-11 20:25:15 +0900
  • 8fe1aee255 add raise_cannot_infer_root_key_error to config Tashiro 2021-02-11 20:14:14 +0900
  • 1a78cf20b6 Correct changelog link [ci skip] 0-8-stable Benjamin Fleischer 2021-01-27 16:05:31 -0600
  • f495f44889
    Merge pull request #2253 from zvkemp/disable-logging-docs Benjamin Fleischer 2021-01-26 16:48:16 -0600
  • 75ec9d5120
    Merge pull request #2408 from rails-api/update_changelog Benjamin Fleischer 2021-01-26 16:30:39 -0600
  • 93b0a0caf4 Update changelog Benjamin Fleischer 2021-01-26 16:28:23 -0600
  • 866e123824
    Merge pull request #2407 from rails-api/0-8-stable-github_ci Benjamin Fleischer 2021-01-26 16:28:51 -0600
  • f7b07b12f3 Try GitHub actions for CI Benjamin Fleischer 2021-01-26 16:18:41 -0600
  • 8f38571ed9
    Merge pull request #2399 from hyli-inc/0-10-stable Wasif Hossain 2021-01-03 11:58:26 +0600
  • e2f48b5067 adding #2399 to CHANGELOG.md Gregory Ray 2021-01-02 15:57:27 -0800
  • c954d39f35 adding #2399 to CHANGELOG.md Gregory Ray 2021-01-02 15:55:36 -0800
  • 023085eaa6 Merge branch '0-10-stable' of github.com:merlsoft/active_model_serializers into 0-10-stable Gregory Ray 2021-01-02 15:24:04 -0800
  • 1f2da3f644 adding #2399 to CHANGELOG.md Gregory Ray 2021-01-02 15:23:49 -0800
  • 863a530b34
    Merge branch '0-10-stable' into 0-10-stable Gregory Ray 2021-01-02 15:12:35 -0800
  • cc2972150f
    Merge pull request #2405 from rails-api/trigger-workflow-on-PR Wasif Hossain 2021-01-03 05:09:24 +0600
  • 1f3a4dd49f
    Trigger github actions workflow on pull request Wasif Hossain 2021-01-03 04:52:15 +0600
  • 1bbd7283ce this fixes a bug where an invalid next link appears if the current page is greater than total_pages Gregory Ray 2020-12-02 15:04:36 -0800
  • 60ba54a3b0
    Set up GitHub actions CI (#2403) Benjamin Fleischer 2020-12-31 17:15:21 -0500
  • ff1a36ffbc Bump to 0.9.8 v0.9.8 0-9-stable Benjamin Fleischer 2020-12-10 14:11:55 -0500
  • 6d651bc9e3 Bump to 0.10.12 v0.10.12 Benjamin Fleischer 2020-12-10 12:42:12 -0500
  • 11574298c9
    Merge pull request #2398 from ritikesh/0-10-stable Benjamin Fleischer 2020-12-08 20:55:50 -0500
  • f2643c1e3b Update rails dependency to < 6.2 Ritikesh 2020-12-09 03:12:21 +0530
  • bc082848e5 Relax bundler dev dep v0.10.11 Benjamin Fleischer 2020-12-04 09:07:40 -0600
  • dac067fec4 Bump version Benjamin Fleischer 2020-12-04 08:59:17 -0600
  • df7475b31c
    Merge pull request #2395 from ritikesh/0-10-stable Benjamin Fleischer 2020-10-16 13:24:36 -0500
  • 321cd287ad try fixing pry gem issues Ritikesh 2020-10-12 22:35:14 +0530
  • 29d8be452f remove explicit require for thread_safe Ritikesh 2020-10-12 19:38:05 +0530
  • c489589527
    Test with Rails 6 by default rm-allow-rails-6.1 Rafael Mendonça França 2020-09-28 23:59:47 +0000
  • c189a89c41
    Allow using bundler 2 Rafael Mendonça França 2020-09-28 23:59:09 +0000
  • c4e1415cbf
    Run in all the branches Rafael Mendonça França 2020-09-28 23:35:18 +0000
  • e58a29c78b
    Allow Rails 6.1 Rafael Mendonça França 2020-09-28 23:25:23 +0000
  • beeb216fab
    Merge pull request #2380 from okuramasafumi/patch-1 master Benjamin Fleischer 2020-05-18 16:22:21 -0500
  • e43c1fdb58
    Change url of fast-jsonapi to forked version OKURA Masafumi 2020-05-19 02:02:15 +0900
  • b1b253f5a8
    Fix Rails 6.0 deprecation on class.parent (#2373) Mark J. Lehman 2020-03-11 19:49:47 -0700
  • ebf97c9bd1
    Define attribute methods in a module included in the base class rm-inheritance Rafael Mendonça França 2020-02-26 17:06:30 -0500
  • 923219a46e
    Uninstall bundler >= 2 if it already exists on travis ruby-2-7 Wasif Hossain 2020-02-19 08:40:43 +0600
  • 10af7a6205
    Restrict rack to <= 2.0.8 as long as grape >= 1.3.0 is not supported Wasif Hossain 2020-02-19 06:40:56 +0600
  • 2d8e634d4d
    Use simplecov < 0.18.x to support ruby < 2.4 Wasif Hossain 2020-02-19 04:10:25 +0600
  • 1a7528884c Remove non-ci changes from 2373 fix_ci_09 Benjamin Fleischer 2020-02-13 21:17:25 -0600
  • 575231503d Trigger travis build Mark J. Lehman 2020-02-13 08:32:14 -0800
  • f6095bbff8 Lock nokogiri for ruby < 2.4 Mark J. Lehman 2020-02-11 21:36:03 -0800
  • 71d729938b Rejigger gemfile to fix sqlite issue Mark J. Lehman 2020-02-11 21:29:35 -0800
  • 89c90b13ea Lock bundler on appveyor Mark J. Lehman 2020-02-11 20:06:58 -0800
  • 0a55cee14f Switch travis to openJDK Mark J. Lehman 2020-02-11 20:03:11 -0800
  • be40a5b628 Update Changelog Mark J. Lehman 2020-01-29 13:17:00 -0800
  • 5f25aa7cba Fix Rails 6.0 deprecation on class.parent Mark J. Lehman 2020-01-29 13:10:35 -0800
  • 02dcd93d22
    Update travis to support Ruby 2.7 along with existing versions Wasif Hossain 2020-01-11 02:37:05 +0600
  • a6120f1691 Add Ruby 2.7 support (#2368) Wasif Hossain 2020-01-09 01:58:11 +0600
  • 64c7fee7a8 Code cleanup (#2369) Wasif Hossain 2020-01-03 08:53:59 +0600
  • 6b093c965f
    Merge pull request #2361 from alexzherdev/2358-sha1 Benjamin Fleischer 2019-10-29 13:17:40 -0500
  • 628eff2582 Update configuration options doc Alex Zherdev 2019-10-17 11:07:37 -0700
  • 7e1c9fcf64 Update changelog Alex Zherdev 2019-10-17 10:43:47 -0700
  • 1c028785eb Introduce use_sha1_digests config option Alex Zherdev 2019-10-16 12:39:02 -0700
  • 5d3f56f0a4 Use SHA1 instead of MD5 for caching Alex Zherdev 2019-10-15 13:12:36 -0700
  • 5ce94fda60
    Merge pull request #2360 from rails-api/bump-ruby Wasif Hossain 2019-10-14 03:22:32 +0600
  • 14eed23105
    Bump Ruby versions on Travis: 2.4.9/2.5.7/2.6.5 Wasif Hossain 2019-10-14 02:40:01 +0600
  • ab47e983f5
    Merge pull request #2356 from rails-api/bump-ruby Wasif Hossain 2019-09-21 04:14:00 +0600
  • 838b1737e0
    Bump Ruby versions on Travis: 2.4.7/2.5.6/2.6.4 Wasif Hossain 2019-09-03 06:04:17 +0600
  • e349395869
    Merge pull request #2340 from rails-api/action_dispatch_response_media_type Wasif Hossain 2019-08-24 01:18:21 +0600
  • 8a0dad673c
    Support jRuby 9.2.8.0 on Travis Wasif Hossain 2019-08-24 00:19:41 +0600
  • 55a6b23cd8
    Configure ActionDispatch::Response#content_type behavior on Rails 6+ Wasif Hossain 2019-06-08 23:45:21 +0600
  • cec9ebab7b
    Merge pull request #2354 from rails-api/rails-6-0-rc2 Wasif Hossain 2019-08-21 23:54:01 +0600
  • 82ad288fc7
    Add support for Rails 6.0.0 on Travis Wasif Hossain 2019-08-21 22:21:31 +0600
  • 95f4ead7de
    Drop support for Ruby 2.4+ against Rails 4.1 from Travis Wasif Hossain 2019-08-05 03:18:41 +0600
  • e981ac6c48
    Require jruby 9.1.x (ruby2.3) and 9.2.x (ruby2.5) to pass on Travis Wasif Hossain 2019-08-05 02:50:03 +0600
  • 9db3dd2579
    Use specific jdbcsqlite3 version for certain version of rails Wasif Hossain 2019-08-05 01:24:10 +0600
  • c907527721
    Use openjdk instead of oraclejdk and jruby 9.1/9.2 Wasif Hossain 2019-08-04 23:57:33 +0600
  • 6b3eb7444e
    Test rails 6.0.0.rc2 on travis Wasif Hossain 2019-08-01 23:46:35 +0600
  • 7baf5d5f64
    Merge pull request #2348 from rails-api/readme Wasif Hossain 2019-07-18 20:04:50 +0600
  • 669c4eebef
    Update README and CHANGELOG Wasif Hossain 2019-07-18 19:31:36 +0600
  • 7b544f3341
    Merge pull request #2344 from rails-api/fieldset-lookup-using-symbol-or-string Wasif Hossain 2019-07-17 16:12:34 +0600
  • 2581fe0362
    Lookup fieldset using either string or symbol Wasif Hossain 2019-07-17 15:51:15 +0600
  • 433c0c646f
    Bump version to 0.10.10 v0.10.10 Wasif Hossain 2019-07-13 15:30:49 +0600
  • 2224cc8b50
    Merge pull request #2172 from AyogoHealth/superclass_namespace Wasif Hossain 2019-07-11 22:59:32 +0600
  • beffbb2bd3
    Follows inheritance with a namespace Rafael Gaspar 2017-09-04 10:28:18 -0300
  • 777fab04ae
    Merge pull request #2337 from InteNs/fix-json-api-belongs-to-fk-on-object Wasif Hossain 2019-06-15 14:50:12 +0600
  • 22849c0399 fix include in failing test Mark Havekes 2019-06-14 09:52:16 +0200
  • 4022337966 Revert "lock jsonapi renderer to < 0.2.1" Mark Havekes 2019-06-13 15:49:55 +0200
  • cee0ad4494 update changelog Mark Havekes 2019-06-13 10:52:44 +0200
  • 58f4f98e41 lock jsonapi renderer to < 0.2.1 Mark Havekes 2019-06-11 23:23:41 +0200
  • 28a172e66a return nil if id is nil Mark Havekes 2019-06-07 12:17:18 +0200
  • 4b0c230d76 add failing test and suggestion Mark Havekes 2019-06-04 10:27:02 +0200
  • 339f99fccc
    Merge pull request #2334 from sikachu/0-10-stable-relax-rails-version Wasif Hossain 2019-06-02 09:32:11 +0600
  • a829bc05b0 Allow AMS to run on Rails 6.0.x Prem Sichanugrist 2019-04-29 20:57:09 +0900
  • 1ff21bac18
    Merge pull request #2321 from iggant/0-10-stable Wasif Hossain 2019-05-02 06:17:21 +0600
  • 4a4a0f263e Stick to bundle < 2 Anton K 2019-03-11 15:08:37 +0200
  • 1ebdda331a
    Merge pull request #2328 from rails-api/rails-6-rc Wasif Hossain 2019-04-29 20:30:33 +0600
  • 0f75837f9e
    Keep rubygems version < 3.0 until we keep supporting ruby < 2.3 Wasif Hossain 2019-04-29 11:58:08 +0600
  • ca43661ac0
    Add support for Rails 6.0.0.rc1 on travis Wasif Hossain 2019-04-29 11:46:20 +0600
  • 19a6188323
    Merge pull request #2304 from greysteil/slim-down-gem Wasif Hossain 2019-04-23 21:03:52 +0600