specify redis gem version number
This commit is contained in:
parent
e08c702494
commit
b09eed715b
4 changed files with 7 additions and 7 deletions
2
Gemfile
2
Gemfile
|
@ -7,7 +7,7 @@ gem 'rails', '3.2.17'
|
|||
# gem 'rails', :git => 'git://github.com/rails/rails.git'
|
||||
|
||||
gem 'devise'
|
||||
gem 'redis'
|
||||
gem 'redis', '2.2.2'
|
||||
gem 'pg'
|
||||
gem 'cancan'
|
||||
gem 'formula'
|
||||
|
|
|
@ -117,7 +117,7 @@ GEM
|
|||
rake (10.3.2)
|
||||
rdoc (3.12.2)
|
||||
json (~> 1.4)
|
||||
redis (3.0.7)
|
||||
redis (2.2.2)
|
||||
sass (3.3.7)
|
||||
sass-rails (3.2.6)
|
||||
railties (~> 3.2.0)
|
||||
|
@ -160,6 +160,6 @@ DEPENDENCIES
|
|||
pg
|
||||
rails (= 3.2.17)
|
||||
rails3-jquery-autocomplete
|
||||
redis
|
||||
redis (= 2.2.2)
|
||||
sass-rails
|
||||
uglifier (>= 1.0.3)
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
});
|
||||
Metamaps.Router = new Router();
|
||||
Metamaps.Router.init = function () {
|
||||
Backbone.history.start({
|
||||
/*Backbone.history.start({
|
||||
pushState: true,
|
||||
root: ''
|
||||
});
|
||||
|
@ -30,6 +30,6 @@
|
|||
evt.preventDefault();
|
||||
Backbone.history.navigate(href.attr, true);
|
||||
}
|
||||
});
|
||||
});*/
|
||||
}
|
||||
})();
|
|
@ -2261,8 +2261,8 @@ Metamaps.Topic = {
|
|||
} else {
|
||||
Metamaps.Visualize.mGraph.loadJSON(newnode);
|
||||
nodeOnViz = Metamaps.Visualize.mGraph.graph.getNode(newnode.id);
|
||||
mapping.set('node', nodeOnViz);
|
||||
mapping.updateNode(); // links the topic and the mapping to the node
|
||||
topic.set('node', nodeOnViz);
|
||||
topic.updateNode(); // links the topic and the mapping to the node
|
||||
|
||||
nodeOnViz.setData("dim", 1, "start");
|
||||
nodeOnViz.setData("dim", 25, "end");
|
||||
|
|
Loading…
Reference in a new issue