diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 16 | 
1 files changed, 8 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8694dcb13..467920b81 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@  GIT    remote: https://github.com/afimb/ninoxe.git -  revision: 581fb0b69e22ede7b176116462848b3d2592423b +  revision: 792ee2e41f6cec1608fb2762bb86e54e95e97e55    branch: rails4    specs:      ninoxe (1.1.3) @@ -57,7 +57,7 @@ GEM        minitest (~> 5.1)        thread_safe (~> 0.1)        tzinfo (~> 1.1) -    acts-as-taggable-on (3.4.3) +    acts-as-taggable-on (3.4.4)        activerecord (>= 3.2, < 5)      acts_as_list (0.6.0)        activerecord (>= 3.0) @@ -107,7 +107,7 @@ GEM      coffee-script-source (1.8.0)      daemons (1.1.9)      database_cleaner (1.4.0) -    dbf (2.0.7) +    dbf (2.0.8)        fastercsv (~> 1.5.4)      deep_cloneable (2.0.2)        activerecord (>= 3.1.0, < 5.0.0) @@ -136,10 +136,10 @@ GEM        activesupport (>= 3.2)      erubis (2.7.0)      execjs (2.2.2) -    factory_girl (2.6.4) -      activesupport (>= 2.3.9) -    factory_girl_rails (1.7.0) -      factory_girl (~> 2.6.0) +    factory_girl (4.5.0) +      activesupport (>= 3.0.0) +    factory_girl_rails (4.5.0) +      factory_girl (~> 4.5.0)        railties (>= 3.0.0)      faraday (0.9.1)        multipart-post (>= 1.2, < 3) @@ -470,7 +470,7 @@ DEPENDENCIES    devise-encryptable    devise-i18n    devise_invitable -  factory_girl_rails (= 1.7) +  factory_girl_rails (~> 4.0)    faraday (~> 0.9.1)    faraday_middleware (~> 0.9.1)    font-awesome-sass (~> 4.2.0)  | 
