summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock2
2 files changed, 1 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 2f3e870cb6d..28168095b36 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,7 +27,7 @@ group :assets do
gem 'uglifier'
end
-group :development do
+group :development do
gem 'rails-footnotes', '>= 3.7.5.rc4'
gem 'annotate', :git => 'git://github.com/ctran/annotate_models.git'
end
@@ -42,7 +42,6 @@ group :development, :test do
gem 'awesome_print'
gem 'database_cleaner'
gem 'launchy'
- gem 'timecop'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 1f40f712af8..01ec37e1ba0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -225,7 +225,6 @@ GEM
rack (>= 1.0.0)
thor (0.14.6)
tilt (1.3.3)
- timecop (0.3.5)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
@@ -277,7 +276,6 @@ DEPENDENCIES
stamp
therubyracer
thin
- timecop
turn
uglifier
will_paginate (~> 3.0)