scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-04 12:14:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1249 from Zanz2/zz_protocols_edit_rtf_form_bug_sci2305_v2

Browse source 
Fixes tinymce rtf editor not displaying (updated gem) [SCI-2305]
This commit is contained in:
Zanz2 2018-08-09 11:49:59 +02:00 • committed by GitHub
commit 2bc7d8a9bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -82,7 +82,7 @@ gem 'devise-async',
gem 'discard', '~> 1.0' gem 'discard', '~> 1.0'
gem 'ruby-graphviz', '~> 1.2' # Graphviz for rails gem 'ruby-graphviz', '~> 1.2' # Graphviz for rails
gem 'tinymce-rails', '~> 4.6.4' # Rich text editor gem 'tinymce-rails', '~> 4.7.13' # Rich text editor
gem 'base62' # Used for smart annotations gem 'base62' # Used for smart annotations
gem 'newrelic_rpm' gem 'newrelic_rpm'

6
Gemfile.lock
View file

@ -497,7 +497,7 @@ GEM
thor (0.20.0) thor (0.20.0)
thread_safe (0.3.6) thread_safe (0.3.6)
tilt (2.0.8) tilt (2.0.8)
tinymce-rails (4.6.7) tinymce-rails (4.7.13)
railties (>= 3.1.1) railties (>= 3.1.1)
turbolinks (5.1.1) turbolinks (5.1.1)
turbolinks-source (~> 5.1) turbolinks-source (~> 5.1)
@ -616,7 +616,7 @@ DEPENDENCIES
sneaky-save! sneaky-save!
spinjs-rails spinjs-rails
starscope starscope
tinymce-rails (~> 4.6.4) tinymce-rails (~> 4.7.13)
turbolinks (~> 5.1.1) turbolinks (~> 5.1.1)
tzinfo-data tzinfo-data
uglifier (>= 1.3.0) uglifier (>= 1.3.0)
@ -631,4 +631,4 @@ RUBY VERSION
ruby 2.4.3p205 ruby 2.4.3p205
BUNDLED WITH BUNDLED WITH
1.16.1 1.16.3