mirrors/notebook
3
0
Fork 0
mirror of https://github.com/indentlabs/notebook.git synced 2025-10-26 11:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Downgrade version of bcrypt for travis

Browse Source
This commit is contained in:
Robert Richter 2015-04-19 15:54:09 -05:00
parent b28c9d6bc3
commit 33ecdfe97b
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -2,7 +2,7 @@
source 'https://rubygems.org'
gem 'bcrypt-ruby', '~> 3.1.5'
gem 'bcrypt-ruby', '~> 3.0.1'
gem 'rails', '4.1.0'
gem 'jquery-rails'
gem 'sass-rails', '~> 4.0.3', require: 'sass'

7
Gemfile.lock
View File

@ -36,9 +36,8 @@ GEM
aws-sdk-v1 (1.64.0)
json (~> 1.4)
nokogiri (>= 1.4.4)
bcrypt (3.1.10-x86-mingw32)
bcrypt-ruby (3.1.5-x86-mingw32)
bcrypt (>= 3.1.3)
bcrypt-ruby (3.0.1)
bcrypt-ruby (3.0.1-x86-mingw32)
bootplus-rails (1.0.0)
builder (3.2.2)
capybara (2.4.4)
@ -212,7 +211,7 @@ PLATFORMS
DEPENDENCIES
aws-sdk (~> 1.50)
bcrypt-ruby (~> 3.1.5)
bcrypt-ruby (~> 3.0.1)
bootplus-rails
capybara
coffee-rails (~> 4.0.0)

2
gemfiles/rails-4.2.edge.gemfile
View File

@ -2,7 +2,7 @@ source 'https://rubygems.org'
source 'https://rubygems.org'
gem 'bcrypt', '~> 3.1.7'
gem 'bcrypt-ruby', '~> 3.0.1'
gem 'rails', '4.1.0'
gem 'jquery-rails'
gem 'sass-rails', '~> 4.0.3', :require => 'sass'