From 100fbd630b07fefec0b37f1a40c7dee89fc8881c Mon Sep 17 00:00:00 2001 From: Zach Rowe Date: Thu, 7 Jul 2016 08:03:35 -0400 Subject: [PATCH 1/2] alphabetize gemfile --- Gemfile | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/Gemfile b/Gemfile index 802debb..683bace 100644 --- a/Gemfile +++ b/Gemfile @@ -1,47 +1,47 @@ source 'https://rubygems.org' +ruby '2.3.1' gem 'rails', '4.2.6' -gem 'pg' -gem 'sass-rails', '~> 5.0' -gem 'uglifier', '>= 1.3.0' + +gem 'acts_as_list' +gem 'aws-sdk', '> 2' +gem 'aws-sdk-v1' #for paperclip +gem 'bootstrap-sass', '~> 3.3.6' +gem 'cancancan', '~> 1.10' gem 'coffee-rails', '~> 4.1.0' gem 'devise' -gem 'cancancan', '~> 1.10' -gem 'bootstrap-sass', '~> 3.3.6' -source 'https://rails-assets.org' do - gem 'rails-assets-tether', '>= 1.1.0' -end - - +gem 'dotenv' +gem 'geocoder' +gem 'jbuilder', '~> 2.0' gem 'jquery-rails' -gem 'turbolinks' gem 'jquery-turbolinks' -gem 'jbuilder', '~> 2.0' gem 'paperclip' +gem 'pg' +gem 'sass-rails', '~> 5.0' gem 'sdoc', '~> 0.4.0', group: :doc -gem 'dotenv' -gem 'acts_as_list' gem 'simple_form' -gem 'aws-sdk-v1' #for paperclip -gem 'aws-sdk', '> 2' -gem 'geocoder' +gem 'turbolinks' +gem 'uglifier', '>= 1.3.0' + +source 'https://rails-assets.org' do + gem 'rails-assets-tether', '>= 1.1.0' +end gem 'rails_12factor', group: :production group :development, :test do gem 'byebug' gem 'dotenv-rails' - gem 'pry' - gem 'pry-remote' - gem 'pry-byebug' - gem 'rspec-rails' gem 'factory_girl_rails' gem 'faker' + gem 'pry' + gem 'pry-byebug' + gem 'pry-remote' gem 'quiet_assets' + gem 'rspec-rails' end group :development do - gem 'web-console', '~> 2.0' gem 'spring' - + gem 'web-console', '~> 2.0' end From f194ed0095e408b5ce73c570498cd86fb6cac66a Mon Sep 17 00:00:00 2001 From: Zach Rowe Date: Sat, 9 Jul 2016 14:10:12 -0400 Subject: [PATCH 2/2] move production gem with others --- Gemfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 683bace..c951d52 100644 --- a/Gemfile +++ b/Gemfile @@ -17,6 +17,7 @@ gem 'jquery-rails' gem 'jquery-turbolinks' gem 'paperclip' gem 'pg' +gem 'rails_12factor', group: :production gem 'sass-rails', '~> 5.0' gem 'sdoc', '~> 0.4.0', group: :doc gem 'simple_form' @@ -27,8 +28,6 @@ source 'https://rails-assets.org' do gem 'rails-assets-tether', '>= 1.1.0' end -gem 'rails_12factor', group: :production - group :development, :test do gem 'byebug' gem 'dotenv-rails'