Merge branch 'develop'

Author: toastercup

.cloud66/manifest.yml

@@ -11,8 +11,6 @@ development:
       region: us-east-1
       size: m3.medium
       root_disk_size: 50
-    extra_packages:
-      - jpegoptim
   postgresql:
     configuration:
       version: 9.6.3
@@ -48,8 +46,6 @@ staging:
       region: us-east-1
       size: m3.medium
       root_disk_size: 50
-    extra_packages:
-      - jpegoptim
   postgresql:
     configuration:
       version: 9.6.3
@@ -85,8 +81,6 @@ production:
       region: us-east-1
       size: c4.xlarge
       root_disk_size: 50
-    extra_packages:
-        - jpegoptim
   postgresql:
     configuration:
       version: 9.6.3

.cloud66/scripts/db_seed.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 cd $STACK_PATH
 
-bundle exec rake db:seed cortex:create_categories cortex:onet:fetch_and_provision
+bundle exec rake db:seed

.codeclimate.yml

@@ -41,34 +41,8 @@ exclude_paths:
 - vendor/
 - app/interactors/
 - app/api/
-- app/assets/javascripts/legacy/
-- app/assets/javascripts/legacy_application.js
-- app/assets/legacy_templates/
-- app/assets/stylesheets/legacy/
-- app/assets/stylesheets/legacy_application.scss
-- app/controllers/legacy_controller.rb
-- app/views/legacy/
 - app/models/abilities/
-- app/models/observers/
-- app/models/media_types/
-- app/models/post_types/
-- app/models/onet/
-- app/models/concerns/searchable*
 - app/models/application.rb
-- app/models/author.rb
-- app/models/bulk_job.rb
-- app/models/category.rb
-- app/models/document.rb
 - app/models/locale.rb
 - app/models/localization.rb
-- app/models/media.rb
-- app/models/onet.rb
-- app/models/post.rb
-- app/models/snippet.rb
-- app/models/webpage.rb
-- app/jobs/bulk_create_media_job.rb
-- app/jobs/bulk_create_users_job.rb
-- app/jobs/cache_bust_webpage_job.rb
-- app/jobs/youtube_media_job.rb
-- app/jobs/youtube_media_job.rb
 - lib/tasks/cortex.rake

.env.example

@@ -5,14 +5,12 @@ DEVISE_SECRET=
 #
 # Asset Host Configuration
 #
-FOG_HOST=http://localhost:3000
 HOST_ALIAS=
 
 # S3
 S3_ACCESS_KEY_ID=
 S3_SECRET_ACCESS_KEY=
 S3_BUCKET_NAME=
-S3_PROTOCOL=
 S3_REGION=
 
 #
@@ -32,16 +30,6 @@ SMTP_USERNAME=
 SMTP_PASSWORD=
 SMTP_STARTTLS=true
 
-#
-# ONET version to use for `rake cortex:onet:fetch_and_provision`
-#
-ONET_VERSION=18.1
-
-#
-# Maximum media filesize
-#
-MEDIA_MAX_SIZE_MB=100
-
 #
 # CORS Configuration
 #
@@ -56,9 +44,6 @@ CORS_ALLOWED_ORIGINS_REGEX=
 # External Services
 #
 
-# APIs
-YOUTUBE_API_KEY=
-
 # Vendor/3rd Party Script Configuration
 GOOGLE_ANALYTICS_ID=
 QUALTRICS_ID=

.gitignore

@@ -9,12 +9,7 @@
 /vendor/bundle
 /vendor/assets
 
-/public/asset_field_types/
 /public/assets/
-/public/media/
-/public/youtubes/
-/public/bulk_jobs/
-/public/content-snippets-edit
 /public/uploads/
 
 # Ignore the default SQLite database.
@@ -53,9 +48,6 @@ pickle-email-*.html
 .env
 /.cloud66/stack.json
 
-# Test Artifacts
-/media
-
 # these should all be checked in to normalise the environment:
 # Gemfile.lock, .ruby-version, .ruby-gemset
 

Brewfile

@@ -5,5 +5,4 @@ Caskroom/cask/java
 elasticsearch
 phantomjs
 imagemagick
-jpegoptim
 ghostscript

Gemfile

@@ -28,11 +28,7 @@ gem 'rolify', '~> 5.1'
 gem 'pundit', '~> 1.1'
 
 # Data
-gem 'rails-observers', git: 'https://github.com/triloch/rails-observers.git'
-gem 'awesome_nested_set', git: 'https://github.com/cortex-cms/awesome_nested_set.git'
-gem 'paperclip', '~> 5.1.0'
-gem 'paperclip-optimizer', '~> 2.0'
-gem 'image_optim_pack', '~> 0.4.0'
+gem 'awesome_nested_set', '~> 3.1.3'
 gem 'acts-as-taggable-on', '~> 4.0'
 gem 'bcrypt', '~> 3.1.11'
 gem 'kaminari', '~> 0.17.0'
@@ -51,32 +47,27 @@ gem 'deep_cloneable', '~> 2.2.2'
 gem 'rack-cors', '~> 0.4.1', require: 'rack/cors'
 
 # Utility
-gem 'excon', '~> 0.55.0'
 gem 'hashie', '~> 3.5.5'
 gem 'hashr', '~> 2.0.1'
-gem 'mime-types', '~> 3.1.0'
-gem 'interactor-rails', '~> 2.0'
+gem 'mimemagic', '~> 0.3.2'
 gem 'virtus', '~> 1.0.5'
-gem 'rubyzip', '~> 1.2.1'
+gem 'interactor-rails', '~> 2.1'
 gem 'addressable', '~> 2.5.1'
 gem 'json'
 
 # External Services
-gem 'yt', '~> 0.30.1'
 gem 'aws-sdk', '~> 2.9'
 
 # Jobs
 gem 'sidekiq', '~> 5.0.0'
-#gem 'sidekiq-failures', '~> 0.4.5' # Disabled until it supports sidekiq 5.x
+gem 'sidekiq-failures', '~> 1.0.0'
 gem 'sinatra', '~> 2.0.0.rc', require: false
 
 # Pipeline
 gem 'sprockets-rails', '3.2.0', require: 'sprockets/railtie'
 gem 'sprockets', '3.7.1'
 gem 'uglifier', '~> 3.2.0'
 gem 'non-stupid-digest-assets', '~> 1.0.9'
-gem 'angular-rails-templates', '~> 1.0.2'
-gem 'ngannotate-rails', '~> 1.2.2'
 
 # View
 gem 'haml', '~> 5.0'
@@ -99,7 +90,6 @@ gem 'turbolinks', '~> 5.0.1'
 gem 'jquery-rails', '~> 4.3.1'
 gem 'jquery-turbolinks', '~> 2.1'
 gem 'jquery-ui-rails', '~> 6.0.1'
-gem 'ng-rails-csrf', '~> 0.1.0'
 gem 'bootstrap-tagsinput-rails', '~> 0.4.2'
 gem 'dialog-polyfill-rails', '~> 0.4.5'
 
@@ -169,7 +159,6 @@ end
 group :test, :development do
   gem 'factory_girl_rails', '~> 4.8'
   gem 'faker', '~> 1.7'
-  gem 'fog-local', '~> 0.3.1'
   gem 'phantomjs', '~> 2.1.1'
   gem 'jasmine-rails', '~> 0.14'
 end