diff options
| -rw-r--r-- | Gemfile | 43 | ||||
| -rw-r--r-- | Gemfile.lock | 21 | ||||
| -rw-r--r-- | config/deploy.rb | 1 |
3 files changed, 9 insertions, 56 deletions
@@ -1,44 +1,30 @@ source 'https://rubygems.org' ruby '2.0.0' -# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.0.0' - -gem 'pg' -gem 'high_voltage', '~> 1.2.1' - -# Use SCSS for stylesheets gem 'sass-rails', '~> 4.0.0' -gem 'bootstrap-sass' - # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' - # Use CoffeeScript for .js.coffee assets and views gem 'coffee-rails', '~> 4.0.0' - -# See https://github.com/sstephenson/execjs#readme for more supported runtimes -# gem 'therubyracer', platforms: :ruby - -# Use jquery as the JavaScript library gem 'jquery-rails' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 1.2' +gem 'unicorn' +gem 'pg' + +# Use ActiveModel has_secure_password +# gem 'bcrypt-ruby', '~> 3.0.0' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks' - -# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 1.2' gem 'gibbon' gem 'dotenv-rails' - -group :doc do - # bundle exec rake doc:rails generates the API under doc/api. - gem 'sdoc', require: false -end +gem 'high_voltage', '~> 1.2.1' +gem 'bootstrap-sass' group :development do gem 'capistrano' - gem 'rvm-capistrano', '1.4.0' end group :development, :test do @@ -46,23 +32,12 @@ group :development, :test do gem 'rspec-fakes' gem 'teaspoon' gem 'capybara' - #gem 'capybara-screenshot' gem 'poltergeist' - gem 'selenium-webdriver' gem 'database_cleaner' gem 'simplecov' gem 'factory_girl_rails' end -# Use ActiveModel has_secure_password -# gem 'bcrypt-ruby', '~> 3.0.0' - -# Use unicorn as the app server -gem 'unicorn' - -# Use debugger -# gem 'debugger', group: [:development, :test] - group :production, :staging do gem 'rails_12factor' end diff --git a/Gemfile.lock b/Gemfile.lock index 7393579..57293f7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,8 +42,6 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - childprocess (0.3.9) - ffi (~> 1.0, >= 1.0.11) coffee-rails (4.0.0) coffee-script (>= 2.2.0) railties (>= 4.0.0.beta, < 5.0) @@ -70,7 +68,6 @@ GEM railties (>= 3.0.0) faye-websocket (0.4.7) eventmachine (>= 0.12.0) - ffi (1.9.0) gibbon (0.4.6) httparty multi_json (>= 1.3.4) @@ -88,7 +85,6 @@ GEM jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.0) kgio (2.8.0) mail (2.5.4) mime-types (~> 1.16) @@ -138,8 +134,6 @@ GEM thor (>= 0.18.1, < 2.0) raindrops (0.11.0) rake (10.1.0) - rdoc (3.12.2) - json (~> 1.4) rspec (2.14.1) rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) @@ -158,22 +152,11 @@ GEM rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) - rubyzip (0.9.9) - rvm-capistrano (1.4.0) - capistrano (>= 2.0.0) sass (3.2.9) sass-rails (4.0.0) railties (>= 4.0.0.beta, < 5.0) sass (>= 3.1.10) sprockets-rails (~> 2.0.0) - sdoc (0.3.20) - json (>= 1.1.3) - rdoc (~> 3.10) - selenium-webdriver (2.33.0) - childprocess (>= 0.2.5) - multi_json (~> 1.0) - rubyzip - websocket (~> 1.0.4) simplecov (0.7.1) multi_json (~> 1.0) simplecov-html (~> 0.7.1) @@ -207,7 +190,6 @@ GEM kgio (~> 2.6) rack raindrops (~> 0.7) - websocket (1.0.7) xpath (2.0.0) nokogiri (~> 1.3) @@ -232,10 +214,7 @@ DEPENDENCIES rails_12factor rspec-fakes rspec-rails - rvm-capistrano (= 1.4.0) sass-rails (~> 4.0.0) - sdoc - selenium-webdriver simplecov teaspoon turbolinks diff --git a/config/deploy.rb b/config/deploy.rb index 2606b9b..5a066f8 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,5 +1,4 @@ require "bundler/capistrano" -require "rvm/capistrano" load "config/recipes/base" load "config/recipes/nginx" |