aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorZakaria BOUZIANE2015-02-17 18:01:48 +0100
committerZakaria BOUZIANE2015-02-17 18:01:48 +0100
commitad74d12ada2bbe2fe961424a3ce529f28cc157da (patch)
tree49371deb59941be5582b1c4311791fcfc940d531 /Gemfile
parent22a0f867d596ff869735eac3f5c5b1028109e813 (diff)
downloadchouette-core-ad74d12ada2bbe2fe961424a3ce529f28cc157da.tar.bz2
Upgrading FactoryGirl to V4.5.0
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 2204206f9..ddc15b7d8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -113,7 +113,7 @@ gem 'squeel'
gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git', :branch => "rails4"
#gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git'
-#gem 'ninoxe',:path => '~/workspace/chouette/ninoxe'
+#gem 'ninoxe',:path => '~/Projets/cityway/ninoxe'
gem 'acts_as_list', '~> 0.6.0'
gem "acts_as_tree", '~> 2.1.0', :require => "acts_as_tree"
@@ -137,7 +137,7 @@ group :test, :development do
gem 'capybara', "~> 2.4.0"
gem 'poltergeist'
gem 'launchy'
- gem 'factory_girl_rails', '1.7'
+ gem 'factory_girl_rails', '~> 4.0'
# gem 'i18n-tasks'
gem 'rb-inotify', :require => RUBY_PLATFORM.include?('linux') && 'rb-inotify'
gem 'rb-fsevent', :require => RUBY_PLATFORM.include?('darwin') && 'rb-fsevent'