git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove ignore for gemfile and gemfile.lock, re-add mysql2

Browse Source
This commit is contained in:
Min Zeya Phyo
2017-06-03 12:48:05 +06:30
parent a9259ca845
commit 4dbf52d5a4
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -43,5 +43,5 @@ config/deploy/config/*
.byebug_history .byebug_history
# Gem files # Gem files
Gemfile #Gemfile
Gemfile.lock #Gemfile.lock

2
Gemfile
View File

@@ -9,7 +9,7 @@ end
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.0' gem 'rails', '~> 5.1.0'
# Use mysql as the database for Active Record # Use mysql as the database for Active Record
#gem 'mysql2', '>= 0.3.18', '< 0.5' gem 'mysql2', '>= 0.3.18', '< 0.5'
#Use PosgreSQL #Use PosgreSQL
gem 'pg' gem 'pg'

2
Gemfile.lock
View File

@@ -114,6 +114,7 @@ GEM
mini_portile2 (2.1.0) mini_portile2 (2.1.0)
minitest (5.10.2) minitest (5.10.2)
multi_json (1.12.1) multi_json (1.12.1)
mysql2 (0.4.6)
nio4r (2.1.0) nio4r (2.1.0)
nokogiri (1.7.2) nokogiri (1.7.2)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.1.0)
@@ -251,6 +252,7 @@ DEPENDENCIES
jquery-rails jquery-rails
kaminari! kaminari!
listen (~> 3.0.5) listen (~> 3.0.5)
mysql2 (>= 0.3.18, < 0.5)
pg pg
prawn prawn
prawn-table prawn-table