Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksey Lim <alsroot@sugarlabs.org>2013-02-03 10:00:47 (GMT)
committer Aleksey Lim <alsroot@sugarlabs.org>2013-02-03 12:59:26 (GMT)
commit4704c0e7e0f475f29ce3793733755d230236edc3 (patch)
treeb07f6db6cf83b75cd712dbaf7d165b2b636a5455
parent74ca0ff786033ae1b49214ad0497c6cde63579d7 (diff)
Reuse rots from gems
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock9
2 files changed, 3 insertions, 8 deletions
diff --git a/Gemfile b/Gemfile
index cbfbb09..1f906cc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -43,7 +43,7 @@ group :test do
gem "factory_girl", "~> 1.3.0"
gem "shoulda", "~> 2.9.1"
gem "tuxml", "0.0.1"
- gem "rots", :git => 'https://github.com/roman/rots.git'
+ gem "rots", "~> 0.2.1"
gem "capybara", "1.0.1"
gem "launchy", "2.0.5" # used only for Capybara's save_and_open_page for launching the browser
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 12f7e01..375dc6d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,3 @@
-GIT
- remote: https://github.com/roman/rots.git
- revision: babb5559aae8914556da528147b6649b9c48f48c
- specs:
- rots (0.2.1)
-
GEM
remote: http://rubygems.org/
specs:
@@ -113,6 +107,7 @@ GEM
vegas (~> 0.1.2)
revo-ssl_requirement (1.1.0)
riddle (1.5.3)
+ rots (0.2.1)
ruby-hmac (0.4.0)
ruby-openid (2.2.2)
ruby-yadis (0.3.4)
@@ -197,7 +192,7 @@ DEPENDENCIES
rdiscount (= 1.3.1.1)
resque (= 1.9.8)
revo-ssl_requirement (= 1.1.0)
- rots!
+ rots (~> 0.2.1)
ruby-hmac (= 0.4.0)
ruby-openid
ruby-yadis (= 0.3.4)