From 7c7106d8ff6f5a9074d8e834cf0e37969f1ae88d Mon Sep 17 00:00:00 2001 From: zmagod Date: Thu, 10 Nov 2016 14:04:22 +0100 Subject: [PATCH] included updated guill-rails version [fixes SCI-639] --- Gemfile | 4 +++- Gemfile.lock | 12 +++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 3b638c1c4..de95bba91 100644 --- a/Gemfile +++ b/Gemfile @@ -58,7 +58,9 @@ gem 'aws-sdk-v1' gem 'delayed_job_active_record' gem 'devise-async' gem 'ruby-graphviz', '~> 1.2' # Graphviz for rails -gem 'quill-rails', '~> 0.1.0' # Rich text editor +gem 'quill-rails', + git: 'https://github.com/biosistemika/quill-rails.git', + branch: 'update_quill_version' # Rich text editor group :development, :test do gem 'byebug' diff --git a/Gemfile.lock b/Gemfile.lock index 39cd0a64a..5d8d86cf3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: https://github.com/biosistemika/quill-rails.git + revision: 425a8482396fde98de972ac0929c933eb09a8c1c + branch: update_quill_version + specs: + quill-rails (0.1.4) + railties (>= 3.1.0, < 5.0) + GEM remote: http://rubygems.org/ specs: @@ -193,8 +201,6 @@ GEM polyglot (0.3.5) powerpack (0.1.1) puma (2.15.3) - quill-rails (0.1.4) - railties (>= 3.1.0, < 5.0) rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) @@ -355,7 +361,7 @@ DEPENDENCIES paperclip (~> 4.3) pg puma - quill-rails (~> 0.1.0) + quill-rails! rails (= 4.2.5) rails_12factor redcarpet