aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Etienne2014-11-24 10:53:30 +0100
committerMichel Etienne2014-11-24 10:53:30 +0100
commit8f54c31ac1775b1bc1efcf555750fcdd6fc61639 (patch)
tree0217e47deb8592dea3aab10421b73655c5b83289
parent3d61c788b87c8a4017dc86c4f2bc211fc784af14 (diff)
downloadchouette-core-8f54c31ac1775b1bc1efcf555750fcdd6fc61639.tar.bz2
correct timetable limits update , Mantis 30109
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index dd02e8afe..fe0d6e9b9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -76,7 +76,7 @@ gem 'ransack'
gem 'squeel'
#gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git'
#gem 'ninoxe',:path => '~/workspace/chouette/ninoxe'
-gem 'ninoxe', '~> 1.1.1'
+gem 'ninoxe', '~> 1.1.2'
gem 'acts_as_list', '0.1.6'
gem "acts_as_tree-1.8", '1.1.0', :require => "acts_as_tree"
diff --git a/Gemfile.lock b/Gemfile.lock
index bbfc5d34b..878cf868d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -201,7 +201,7 @@ GEM
net-ssh (2.6.2)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
- ninoxe (1.1.1)
+ ninoxe (1.1.2)
activerecord (~> 3.2.13)
acts-as-taggable-on (>= 3)
acts_as_list (>= 0.1.6)
@@ -415,7 +415,7 @@ DEPENDENCIES
map_layers (= 0.0.4)
modernizr-rails (~> 2.0.6)
morrisjs-rails
- ninoxe (~> 1.1.1)
+ ninoxe (~> 1.1.2)
pg (~> 0.11.0)
rabl
rails (= 3.2.18)