Skip to content

Commit

Permalink
Connect and create database.
Browse files Browse the repository at this point in the history
  • Loading branch information
ebihara99999 committed Oct 24, 2016
1 parent cc49dde commit 7319ccb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.4'
# Use mysql as the database for Active Record
gem 'mysql2'
gem 'mysql2', '~> 0.3.20'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
Expand Down Expand Up @@ -44,4 +44,3 @@ group :development do
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
end

4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ GEM
mini_portile2 (2.1.0)
minitest (5.9.1)
multi_json (1.12.1)
mysql2 (0.4.5)
mysql2 (0.3.21)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
rack (1.6.4)
Expand Down Expand Up @@ -149,7 +149,7 @@ DEPENDENCIES
coffee-rails (~> 4.1.0)
jbuilder (~> 2.0)
jquery-rails
mysql2
mysql2 (~> 0.3.20)
rails (= 4.2.4)
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
Expand Down
2 changes: 1 addition & 1 deletion config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ default: &default
encoding: utf8
pool: 5
username: root
password:
password: <%= ENV['MYSQL_PASS'] %>
socket: /tmp/mysql.sock

development:
Expand Down

0 comments on commit 7319ccb

Please sign in to comment.