Skip to content

Commit 9ec40ca

Browse files
committed
removes autodetecting db code
1 parent 3baaf00 commit 9ec40ca

File tree

2 files changed

+4
-23
lines changed

2 files changed

+4
-23
lines changed

Gemfile

+2-21
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
source 'https://rubygems.org'
22
ruby '2.3.3'
3-
43
gem 'rails', '4.2.7.1'
5-
gem 'puma'
64

5+
gem 'puma'
76
gem 'aws-sdk', '< 2.0' # if ENV['storage'] == "s3"
87
gem 'figaro'
98
gem 'devise'
@@ -31,8 +30,6 @@ group :development do
3130
end
3231

3332
group :development, :test do
34-
gem 'byebug'
35-
# gem 'rack-mini-profiler'
3633
gem 'factory_girl_rails'
3734
gem 'faker'
3835
gem 'pry-rails'
@@ -42,24 +39,8 @@ group :development, :test do
4239
end
4340

4441
group :production do
45-
require 'uri'
4642
gem 'rails_12factor'
47-
#gem 'pg'
48-
49-
# Include database gems for the adapters found in the environment
50-
if ENV['db_adapter'] || ENV['DATABASE_URL']
51-
52-
case ENV['db_adapter'] || URI.parse(ENV['DATABASE_URL']).scheme
53-
when "mysql", "mysql2"
54-
gem 'mysql2'
55-
when "postgres"
56-
gem 'pg'
57-
else
58-
warn("ERROR: Couldn't figure out what db_adapter to use by parsing the env var DATABASE_URL.")
59-
end
60-
else
61-
warn("ERROR: Please configure your config/application.yml first (or set env variable on target)") unless File.exists?("config/application.yml")
62-
end
43+
gem 'mysql2'
6344
end
6445

6546
group :test do

Gemfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ GEM
5151
binding_of_caller (0.7.2)
5252
debug_inspector (>= 0.0.1)
5353
builder (3.2.2)
54-
byebug (9.0.4)
5554
capybara (2.6.2)
5655
addressable
5756
mime-types (>= 1.16)
@@ -125,6 +124,7 @@ GEM
125124
mini_portile2 (2.1.0)
126125
minitest (5.10.2)
127126
multi_json (1.11.2)
127+
mysql2 (0.4.6)
128128
nokogiri (1.6.8)
129129
mini_portile2 (~> 2.1.0)
130130
pkg-config (~> 1.1.7)
@@ -266,7 +266,6 @@ DEPENDENCIES
266266
aws-sdk (< 2.0)
267267
better_errors
268268
binding_of_caller
269-
byebug
270269
capybara
271270
coffee-rails (~> 4.1.0)
272271
database_cleaner
@@ -278,6 +277,7 @@ DEPENDENCIES
278277
jquery-rails
279278
jquery-ui-rails
280279
launchy
280+
mysql2
281281
nokogiri
282282
paperclip (~> 4.3)
283283
poltergeist

0 commit comments

Comments
 (0)