Merge branch 'refs/heads/feature-redesign-rantology' into develop

Conflicts:
	app/assets/stylesheets/sass/index.sass
	spec/spec_helper.rb

.env.example

@@ -4,11 +4,11 @@ APP_SECRET=
 
 DEPLOY_PATH=
 
-UNICORN_USER=deploy
-UNICORN_GROUP=deploy
-UNICORN_WORKERS=4
-UNICORN_PORT=4000
-UNICORN_SOCKET=/tmp/unicorn.ensl.sock
+PUMA_WORKERS=1
+PUMA_MIN_THREADS=1
+PUMA_MAX_THREADS=16
+PUMA_PORT=4000
+PUMA_TIMEOUT=30
 
 MYSQL_DATABASE=ensl
 MYSQL_USERNAME=

.gitignore

@@ -14,10 +14,11 @@
 # OS X
 .DS_Store
 
-# Assets
+# Uploaded Assets
 /public/system/*
 /public/files/*
 /public/local
+/public/uploads
 
 # RubyMine
 /.idea

Capfile

@@ -3,6 +3,5 @@ require 'capistrano/deploy'
 require 'capistrano/rbenv'
 require 'capistrano/bundler'
 require 'capistrano/rails'
-require 'capistrano3/unicorn'
 
 Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }

Gemfile

@@ -6,6 +6,7 @@ gem 'dotenv-rails', '~> 0.10.0'
 gem 'rails', '~> 3.2.17'
 gem 'mysql2', '~> 0.3.15'
 gem 'dalli', '~> 2.7.0'
+gem 'puma', '~> 2.8.2'
 
 gem 'exceptional', '~> 2.0.33'
 gem 'oj', '~> 2.5.5'
@@ -21,13 +22,19 @@ gem 'newrelic_rpm', '~> 3.7.2.195'
 gem 'will_paginate', '~> 3.0.5'
 gem 'dynamic_form', '~> 1.1.4'
 gem 'country_code_select', '~> 1.0.1'
+gem 'active_link_to', '~> 1.0.2'
 gem 'rmagick', '~> 2.13.2', require: false
 
 gem 'sprockets', '~> 2.2.1'
-gem 'tinymce-rails', '~> 3.5.9'
-gem 'jquery-rails', '~> 2.0.2'
-gem 'sass-rails', '~> 3.2.5'
 gem 'coffee-rails', '~> 3.2.2'
+gem 'jquery-rails', '~> 2.0.2'
+gem 'tinymce-rails', '~> 3.5.9'
+gem 'sass', '~> 3.3.4'
+gem 'sass-rails', '~> 3.2.6'
+
+gem 'font-awesome-sass', '~> 4.0.3.1'
+gem 'bourbon', '~> 3.1.8'
+gem 'neat', '~> 1.6.0'
 
 group :assets do
   gem 'uglifier', '~> 2.5.0'
@@ -38,9 +45,10 @@ group :development do
   gem 'capistrano-rbenv', '~> 2.0.2'
   gem 'capistrano-bundler', '~> 1.1.2'
   gem 'capistrano-rails', '~> 1.1'
-  gem 'capistrano3-unicorn', '~> 0.1.1'
+  gem 'better_errors', '~> 1.1.0'
+  gem 'binding_of_caller', '~> 0.7.2'
   gem 'annotate', '~> 2.6.2'
-  gem 'quiet_assets'
+  gem 'quiet_assets', '~> 1.0.2'
 end
 
 group :test do
@@ -58,8 +66,3 @@ end
 group :development, :test do
   gem 'pry-debugger', '~> 0.2.2'
 end
-
-group :staging, :production do
-  gem 'kgio', '~> 2.9.2'
-  gem 'unicorn', '~> 4.8.2'
-end

Gemfile.lock

@@ -14,6 +14,8 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
+    active_link_to (1.0.2)
+      actionpack
     activemodel (3.2.17)
       activesupport (= 3.2.17)
       builder (~> 3.0.0)
@@ -33,7 +35,15 @@ GEM
       rake (>= 0.8.7)
     arel (3.0.3)
     bbcoder (1.0.1)
+    better_errors (1.1.0)
+      coderay (>= 1.0.0)
+      erubis (>= 2.6.6)
+    binding_of_caller (0.7.2)
+      debug_inspector (>= 0.0.1)
     bluecloth (2.2.0)
+    bourbon (3.1.8)
+      sass (>= 3.2.0)
+      thor
     builder (3.0.4)
     capistrano (3.1.0)
       i18n
@@ -48,8 +58,6 @@ GEM
     capistrano-rbenv (2.0.2)
       capistrano (~> 3.1)
       sshkit (~> 1.3)
-    capistrano3-unicorn (0.1.1)
-      capistrano (>= 3.1.0)
     capybara (2.2.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -79,6 +87,7 @@ GEM
       activesupport (>= 3.0)
     dalli (2.7.0)
     database_cleaner (1.2.0)
+    debug_inspector (0.0.2)
     debugger (1.6.6)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
@@ -104,6 +113,8 @@ GEM
       multipart-post (>= 1.2, < 3)
     ffi (1.9.3)
     ffi (1.9.3-x86-mingw32)
+    font-awesome-sass (4.0.3.1)
+      sass (~> 3.2)
     gruff (0.3.6)
     hike (1.2.3)
     i18n (0.6.9)
@@ -112,7 +123,6 @@ GEM
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
     json (1.8.1)
-    kgio (2.9.2)
     libv8 (3.16.14.3)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -123,6 +133,9 @@ GEM
     multi_json (1.8.4)
     multipart-post (2.0.0)
     mysql2 (0.3.15)
+    neat (1.6.0)
+      bourbon (>= 3.1)
+      sass (>= 3.3)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.8.0)
@@ -150,6 +163,8 @@ GEM
     pry-debugger (0.2.2)
       debugger (~> 1.3)
       pry (~> 0.9.10)
+    puma (2.8.2)
+      rack (>= 1.1, < 2.0)
     quiet_assets (1.0.2)
       railties (>= 3.1, < 5.0)
     rack (1.4.5)
@@ -174,7 +189,6 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    raindrops (0.13.0)
     rake (10.1.1)
     rdoc (3.12.2)
       json (~> 1.4)
@@ -195,8 +209,8 @@ GEM
     rubyzip (1.1.2)
     sanitize (2.1.0)
       nokogiri (>= 1.4.4)
-    sass (3.1.20)
-    sass-rails (3.2.5)
+    sass (3.3.4)
+    sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
@@ -209,7 +223,7 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    slop (3.4.7)
+    slop (3.5.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -224,7 +238,7 @@ GEM
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
-    thor (0.18.1)
+    thor (0.19.1)
     tilt (1.4.1)
     timecop (0.7.1)
     tins (1.0.1)
@@ -237,10 +251,6 @@ GEM
     uglifier (2.5.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    unicorn (4.8.2)
-      kgio (~> 2.6)
-      rack
-      raindrops (~> 0.7)
     websocket (1.0.7)
     websocket-driver (0.3.2)
     will_paginate (3.0.5)
@@ -253,14 +263,17 @@ PLATFORMS
   x86-mingw32
 
 DEPENDENCIES
+  active_link_to (~> 1.0.2)
   annotate (~> 2.6.2)
   bbcoder (~> 1.0.1)
+  better_errors (~> 1.1.0)
+  binding_of_caller (~> 0.7.2)
   bluecloth (~> 2.2.0)
+  bourbon (~> 3.1.8)
   capistrano (~> 3.1.0)
   capistrano-bundler (~> 1.1.2)
   capistrano-rails (~> 1.1)
   capistrano-rbenv (~> 2.0.2)
-  capistrano3-unicorn (~> 0.1.1)
   capybara (~> 2.2.1)
   carrierwave (~> 0.10.0)
   codeclimate-test-reporter (~> 0.3.0)
@@ -273,21 +286,24 @@ DEPENDENCIES
   exceptional (~> 2.0.33)
   factory_girl_rails (~> 4.4.1)
   faraday (~> 0.9.0)
+  font-awesome-sass (~> 4.0.3.1)
   gruff (~> 0.3.6)
   jquery-rails (~> 2.0.2)
-  kgio (~> 2.9.2)
   mysql2 (~> 0.3.15)
+  neat (~> 1.6.0)
   newrelic_rpm (~> 3.7.2.195)
   nokogiri (~> 1.6.1)
   oj (~> 2.5.5)
   poltergeist (~> 1.5.0)
   pry-debugger (~> 0.2.2)
-  quiet_assets
+  puma (~> 2.8.2)
+  quiet_assets (~> 1.0.2)
   rails (~> 3.2.17)
   rmagick (~> 2.13.2)
   rspec-rails (~> 2.14.1)
   sanitize (~> 2.1.0)
-  sass-rails (~> 3.2.5)
+  sass (~> 3.3.4)
+  sass-rails (~> 3.2.6)
   selenium-webdriver (~> 2.41.0)
   simplecov (~> 0.7.1)
   sprockets (~> 2.2.1)
@@ -295,5 +311,4 @@ DEPENDENCIES
   timecop (~> 0.7.1)
   tinymce-rails (~> 3.5.9)
   uglifier (~> 2.5.0)
-  unicorn (~> 4.8.2)
   will_paginate (~> 3.0.5)

README.md

@@ -35,4 +35,5 @@ Features:
 - [Ari Timonen](https://github.com/jirikivaari) (Original Author)
 - [Florent Latombe](https://github.com/flatombe)
 - [Luke Barratt](https://github.com/lbarratt)
-- [Callum Barratt](https://github.com/cbarratt)
+- [Callum Barratt](https://github.com/cbarratt)
+- [Joseph Hutchins](https://github.com/taekwonjoe01)