diff --git a/.gitignore b/.gitignore index 1f34d1d..b764e97 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ coverage/ .ruby-version secrets.yml + +public/assets/ diff --git a/Gemfile b/Gemfile index 95c0d5c..79594c4 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem 'nokogiri', '~> 1.6.2.1' gem 'jbuilder', '~> 2.1.2' gem 'bcrypt', '~> 3.1.7' -gem 'rails', '~> 4.1.4' +gem 'rails', '~> 4.1.8' gem 'sass-rails', '~> 4.0.3' gem 'less-rails', '~> 2.5.0' gem 'uglifier', '~> 2.5.1' @@ -45,12 +45,12 @@ group :test do gem 'simplecov' end -# Use unicorn as the app server -# gem 'unicorn' - -# Use Capistrano for deployment -# gem 'capistrano-rails', group: :development - -# Use debugger -# gem 'debugger', group: [:development, :test] +group :cap do + gem 'capistrano' + gem 'capistrano-bundler' + gem 'capistrano-rails' +end +group :mysql do + gem 'mysql2' +end \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 72ab095..9c68574 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,27 +1,27 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) + actionmailer (4.1.8) + actionpack (= 4.1.8) + actionview (= 4.1.8) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.7) - actionview (= 4.1.7) - activesupport (= 4.1.7) + actionpack (4.1.8) + actionview (= 4.1.8) + activesupport (= 4.1.8) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.7) - activesupport (= 4.1.7) + actionview (4.1.8) + activesupport (= 4.1.8) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.7) - activesupport (= 4.1.7) + activemodel (4.1.8) + activesupport (= 4.1.8) builder (~> 3.1) - activerecord (4.1.7) - activemodel (= 4.1.7) - activesupport (= 4.1.7) + activerecord (4.1.8) + activemodel (= 4.1.8) + activesupport (= 4.1.8) arel (~> 5.0.0) - activesupport (4.1.7) + activesupport (4.1.8) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -30,14 +30,27 @@ GEM arel (5.0.1.20140414130214) bcrypt (3.1.9) builder (3.2.2) + capistrano (3.3.5) + capistrano-stats (~> 1.1.0) + i18n + rake (>= 10.0.0) + sshkit (~> 1.3) + capistrano-bundler (1.1.3) + capistrano (~> 3.1) + sshkit (~> 1.2) + capistrano-rails (1.1.2) + capistrano (~> 3.1) + capistrano-bundler (~> 1.1) + capistrano-stats (1.1.1) coderay (1.1.0) + colorize (0.7.4) commonjs (0.2.7) docile (1.1.5) erubis (2.7.0) execjs (2.2.2) faraday (0.9.0) multipart-post (>= 1.2, < 3) - hashie (3.3.1) + hashie (3.3.2) hike (1.2.3) html5shiv-rails (0.0.2) railties (>= 3.2.0, < 5.0) @@ -49,7 +62,7 @@ GEM railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) - jwt (1.0.0) + jwt (1.2.0) kgio (2.9.2) less (2.5.1) commonjs (~> 0.2.7) @@ -57,18 +70,22 @@ GEM actionpack (>= 3.1) less (~> 2.5.0) libv8 (3.16.14.7) - mail (2.6.1) + mail (2.6.3) mime-types (>= 1.16, < 3) method_source (0.8.2) mime-types (2.4.3) mini_portile (0.6.0) - minitest (5.4.2) + minitest (5.5.0) minitest-power_assert (0.0.3) minitest power_assert multi_json (1.10.1) multi_xml (0.5.5) multipart-post (2.0.0) + mysql2 (0.3.17) + net-scp (1.2.1) + net-ssh (>= 2.6.5) + net-ssh (2.9.1) nokogiri (1.6.2.1) mini_portile (= 0.6.0) oauth2 (1.0.0) @@ -88,7 +105,7 @@ GEM multi_json (~> 1.3) oauth2 (~> 1.0) omniauth (~> 1.2) - power_assert (0.1.4) + power_assert (0.2.2) pry (0.10.1) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -101,34 +118,34 @@ GEM rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) - rails (4.1.7) - actionmailer (= 4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) - activemodel (= 4.1.7) - activerecord (= 4.1.7) - activesupport (= 4.1.7) + rails (4.1.8) + actionmailer (= 4.1.8) + actionpack (= 4.1.8) + actionview (= 4.1.8) + activemodel (= 4.1.8) + activerecord (= 4.1.8) + activesupport (= 4.1.8) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.7) + railties (= 4.1.8) sprockets-rails (~> 2.0) rails-timeago (2.11.1) actionpack (>= 3.1) activesupport (>= 3.1) - railties (4.1.7) - actionpack (= 4.1.7) - activesupport (= 4.1.7) + railties (4.1.8) + actionpack (= 4.1.8) + activesupport (= 4.1.8) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.13.0) - rake (10.3.2) - rdoc (4.1.2) + rake (10.4.2) + rdoc (4.2.0) json (~> 1.4) ref (1.0.5) sass (3.2.19) - sass-rails (4.0.4) + sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) sass (~> 3.2.2) - sprockets (~> 2.8, < 2.12) + sprockets (~> 2.8, < 3.0) sprockets-rails (~> 2.0) sdoc (0.4.1) json (~> 1.7, >= 1.7.7) @@ -149,16 +166,20 @@ GEM railties (>= 3.0, < 4.2) slim (~> 2.0) slop (3.6.0) - sprockets (2.11.3) + sprockets (2.12.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.0) + sprockets-rails (2.2.2) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) sqlite3 (1.3.10) + sshkit (1.5.1) + colorize + net-scp (>= 1.1.2) + net-ssh (>= 2.8.0) temple (0.6.10) therubyracer (0.12.1) libv8 (~> 3.16.14.0) @@ -187,19 +208,23 @@ PLATFORMS DEPENDENCIES bcrypt (~> 3.1.7) + capistrano + capistrano-bundler + capistrano-rails execjs (~> 2.2.1) html5shiv-rails jbuilder (~> 2.1.2) jquery-rails (~> 3.1.1) less-rails (~> 2.5.0) minitest-power_assert + mysql2 nokogiri (~> 1.6.2.1) omniauth (~> 1.2.1) omniauth-github (~> 1.1.2) pry pry-doc pry-rails - rails (~> 4.1.4) + rails (~> 4.1.8) rails-timeago (~> 2.11) sass-rails (~> 4.0.3) sdoc (~> 0.4.0)