Update Gemfile.lock with new Devise version
Also bump master with latest mongoid
This commit is contained in:
parent
5ecbbdf260
commit
a5e63d7a28
|
@ -1,6 +1,6 @@
|
|||
GIT
|
||||
remote: git://github.com/mongoid/mongoid.git
|
||||
revision: fe7f43430580860db6d1d89cea27eda24ab60ab1
|
||||
revision: 346a79a7d01aa194de80e649916239a18d38ce13
|
||||
branch: master
|
||||
specs:
|
||||
mongoid (4.0.0)
|
||||
|
@ -12,7 +12,7 @@ GIT
|
|||
PATH
|
||||
remote: .
|
||||
specs:
|
||||
devise (3.0.1)
|
||||
devise (3.1.0.rc)
|
||||
bcrypt-ruby (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 3.2.6, < 5)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
PATH
|
||||
remote: ..
|
||||
specs:
|
||||
devise (3.0.1)
|
||||
devise (3.1.0.rc)
|
||||
bcrypt-ruby (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 3.2.6, < 5)
|
||||
|
@ -39,7 +39,7 @@ GEM
|
|||
i18n (= 0.6.1)
|
||||
multi_json (~> 1.0)
|
||||
arel (3.0.2)
|
||||
atomic (1.1.10)
|
||||
atomic (1.1.12)
|
||||
bcrypt-ruby (3.1.1)
|
||||
builder (3.0.4)
|
||||
erubis (2.7.0)
|
||||
|
@ -126,7 +126,7 @@ GEM
|
|||
tilt (~> 1.1, != 1.3.0)
|
||||
sqlite3 (1.3.7)
|
||||
thor (0.18.1)
|
||||
thread_safe (0.1.0)
|
||||
thread_safe (0.1.2)
|
||||
atomic
|
||||
tilt (1.4.0)
|
||||
treetop (1.4.12)
|
||||
|
|
Loading…
Reference in New Issue