Gemfile in tmatt_cms-0.1.4

- old
+ new

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
+# source 'https://gems.ruby-china.org/'
 
-
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '4.2.6'
 
 gem 'thor', '0.19.1', '!=0.19.2', '!=0.19.3', '!=0.19.4'
 
@@ -48,11 +48,13 @@
 gem 'devise', '~> 3.4.1'
 gem 'devise-async'
 gem 'omniauth-facebook'
 
 
-gem 'paperclip'
+gem 'carrierwave', '~> 1.0'
+gem 'mini_magick'
+
 gem 'cancan'
 gem 'exception_notification', '~> 4.0.1'
 gem 'simple_token_authentication', '~> 1.0'
 gem 'activeadmin', github: 'activeadmin'
 
@@ -72,16 +74,15 @@
 gem 'hashie-forbidden_attributes'
 
 group :development, :test do
   # gem 'rspec'
   gem 'rspec-rails', '~> 3.0'
+  gem 'capybara'
   gem 'simplecov'
   gem 'factory_girl_rails', '~> 4.0'
 end
 
-gem 'ckeditor'
-
 # keep track of views count
 gem 'views_count', '0.0.3'
 
 # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
 
@@ -128,6 +129,11 @@
 
 # Owl Carousel
 gem 'owlcarousel-rails'
 
 # Material Icon
-gem 'material_icons'
+gem 'material_icons'
+
+# Froala
+gem 'wysiwyg-rails'
+
+gem 'aws-sdk', '~> 2'
\ No newline at end of file