Commit b010f99

committed

Merge branch 'develop' into staging

2 parents d2009be + d3f4dbb commit b010f99Copy full SHA for b010f99

11 files changed

+151

-107

lines changed

Gemfile.lock
Gemfile
app
- models
- resources
  - concerns
    - operator_documentable.rb
  - v1
    - operator_document_history_resource.rb
    - operator_document_resource.rb
lib/tasks
- documents.rake
spec
- factories
  - users.rb
- integration/v1
  - operator_documents_spec.rb

11 files changed

+151

-107

lines changed

`‎Gemfile‎`

-Original file line number
+Diff line change
 gem "active_skin"
 # WYSIWYG
 -gem "activeadmin_quill_editor"
 +gem "activeadmin_quill_editor", "~> 1.0"
 # Graphs
 gem "chartkick"

Comments

(0)