update travis

This commit is contained in:
peng 2016-09-10 22:10:58 +08:00
parent 8453ea0990
commit f1f4d8daab
2 changed files with 7 additions and 8 deletions

13
Gemfile
View File

@ -1,12 +1,10 @@
source 'https://gems.ruby-china.org'
gem 'bootstrap-sass','~> 3.3.7'
gem 'bootstrap-sass', '~> 3.3.7'
# Use ActiveModel has_secure_password
gem 'bcrypt','~> 3.1.11'
gem 'faker','~> 1.6.3'
gem 'rails_admin','~> 0.8.1'
gem 'bcrypt', '~> 3.1.11'
gem 'faker', '~> 1.6.3'
gem 'rails_admin', '~> 0.8.1'
# gem 'carrierwave'
# gem 'paperclip'
@ -39,7 +37,8 @@ gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc
gem 'pg'
# for postgresql
gem 'pg', '~> 0.18.4'
# gem 'bcrypt', '~> 3.1.7'

View File

@ -195,7 +195,7 @@ DEPENDENCIES
faker (~> 1.6.3)
jbuilder (~> 2.0)
jquery-rails
pg
pg (~> 0.18.4)
rails (= 4.2.5.2)
rails_12factor
rails_admin (~> 0.8.1)