Skip to content

Commit

Permalink
Merge pull request #270 from platanus/always-include-api-error-concern
Browse files Browse the repository at this point in the history
fix(api): include error concern regardless of the environment
  • Loading branch information
rjherrera authored Feb 17, 2020
2 parents b78adcc + d692a7c commit ef7db5c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Fix:
- Correctly use cache for bundle dependencies in CircleCI build [#244](https://github.com/platanus/potassium/pull/244) and [#258](https://github.com/platanus/potassium/pull/258)
- Fix model auto annotate [#260](https://github.com/platanus/potassium/pull/260)
- Fix sidekiq repeated installation on potassium create if selecting mailer [#262](https://github.com/platanus/potassium/pull/262)
- Include ApiErrorConcern in all environments [#270](https://github.com/platanus/potassium/pull/270)

## 5.2.3

Expand Down
4 changes: 1 addition & 3 deletions lib/potassium/assets/api/base_controller.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
class Api::V1::BaseController < ApplicationController
if Rails.env.production?
include ApiErrorConcern
end
include ApiErrorConcern

self.responder = ApiResponder

Expand Down

0 comments on commit ef7db5c

Please sign in to comment.