Merge remote-tracking branch 'upstream/master'

pero-ict-solutions · Aug 15, 2013 · 379129a · 379129a
2 parents 700fbdf + afaa68c
commit 379129a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/views/shared/editor_engines/_tiny_mce.html.erb b/app/views/shared/editor_engines/_tiny_mce.html.erb
@@ -1,4 +1,4 @@
-<%= javascript_include_tag('tinymce-jquery') %>
+<%= javascript_include_tag('tinymce') %>
 
 <script type="text/javascript">
   $(function() {

diff --git a/spree_editor.gemspec b/spree_editor.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'capybara', '~> 2.1'
   s.add_development_dependency 'coffee-rails'
-  s.add_development_dependency 'database_cleaner'
+  s.add_development_dependency 'database_cleaner', '~> 1.0.1'
   s.add_development_dependency 'factory_girl_rails', '~> 4.2'
   s.add_development_dependency 'ffaker'
   s.add_development_dependency 'rspec-rails',  '~> 2.12'