Skip to content
Permalink
Browse files

Fix up Gemfiles for pg gem

  • Loading branch information...
mhartl committed Jun 7, 2017
1 parent ed051cd commit 1842030bc6c1b557be66a10828eda843c1b74e19
Showing with 25 additions and 15 deletions.
  1. +16 −13 hello_app/Gemfile_final
  2. +9 −2 toy_app/Gemfile
@@ -1,29 +1,32 @@
source 'https://rubygems.org'

gem 'rails', '5.0.1'
gem 'puma', '3.4.0'
gem 'rails', '5.0.3'
gem 'puma', '3.9.1'
gem 'sass-rails', '5.0.6'
gem 'uglifier', '3.0.0'
gem 'coffee-rails', '4.2.1'
gem 'jquery-rails', '4.1.1'
gem 'uglifier', '3.2.0'
gem 'coffee-rails', '4.2.2'
gem 'jquery-rails', '4.3.1'
gem 'turbolinks', '5.0.1'
gem 'jbuilder', '2.4.1'
gem 'jbuilder', '2.6.4'

group :development, :test do
gem 'sqlite3', '1.3.12'
gem 'byebug', '9.0.0', platform: :mri
gem 'sqlite3', '1.3.13'
gem 'byebug', '9.0.6', platform: :mri
end

group :development do
gem 'web-console', '3.1.1'
gem 'web-console', '3.5.1'
gem 'listen', '3.0.8'
gem 'spring', '1.7.2'
gem 'spring-watcher-listen', '2.0.0'
gem 'spring', '2.0.2'
gem 'spring-watcher-listen', '2.0.1'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

group :production do
gem 'pg', '0.18.4'
gem 'pg', '0.20.0'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
@@ -1,7 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '5.0.3'
gem 'sqlite3', '1.3.13'
gem 'puma', '3.9.1'
gem 'sass-rails', '5.0.6'
gem 'uglifier', '3.2.0'
@@ -11,7 +10,8 @@ gem 'turbolinks', '5.0.1'
gem 'jbuilder', '2.6.4'

group :development, :test do
gem 'byebug', '9.0.6', platform: :mri
gem 'sqlite3', '1.3.13'
gem 'byebug', '9.0.6', platform: :mri
end

group :development do
@@ -23,3 +23,10 @@ end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

group :production do
gem 'pg', '0.20.0'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

0 comments on commit 1842030

Please sign in to comment.
You can’t perform that action at this time.