Commit 01f72bfa83ef05817c2e9898a62ae09919a6d505
1 parent
325b8454
Exists in
master
and in
4 other branches
Revert "install timecop for testing"
This reverts commit 0aa5682f8e3d2f50443fa8ac457daf5c9784dfd8.
Showing
2 changed files
with
1 additions
and
4 deletions
Show diff stats
Gemfile
| @@ -27,7 +27,7 @@ group :assets do | @@ -27,7 +27,7 @@ group :assets do | ||
| 27 | gem 'uglifier' | 27 | gem 'uglifier' |
| 28 | end | 28 | end |
| 29 | 29 | ||
| 30 | -group :development do | 30 | +group :development do |
| 31 | gem 'rails-footnotes', '>= 3.7.5.rc4' | 31 | gem 'rails-footnotes', '>= 3.7.5.rc4' |
| 32 | gem 'annotate', :git => 'git://github.com/ctran/annotate_models.git' | 32 | gem 'annotate', :git => 'git://github.com/ctran/annotate_models.git' |
| 33 | end | 33 | end |
| @@ -42,7 +42,6 @@ group :development, :test do | @@ -42,7 +42,6 @@ group :development, :test do | ||
| 42 | gem 'awesome_print' | 42 | gem 'awesome_print' |
| 43 | gem 'database_cleaner' | 43 | gem 'database_cleaner' |
| 44 | gem 'launchy' | 44 | gem 'launchy' |
| 45 | - gem 'timecop' | ||
| 46 | end | 45 | end |
| 47 | 46 | ||
| 48 | 47 |
Gemfile.lock
| @@ -225,7 +225,6 @@ GEM | @@ -225,7 +225,6 @@ GEM | ||
| 225 | rack (>= 1.0.0) | 225 | rack (>= 1.0.0) |
| 226 | thor (0.14.6) | 226 | thor (0.14.6) |
| 227 | tilt (1.3.3) | 227 | tilt (1.3.3) |
| 228 | - timecop (0.3.5) | ||
| 229 | treetop (1.4.10) | 228 | treetop (1.4.10) |
| 230 | polyglot | 229 | polyglot |
| 231 | polyglot (>= 0.3.1) | 230 | polyglot (>= 0.3.1) |
| @@ -277,7 +276,6 @@ DEPENDENCIES | @@ -277,7 +276,6 @@ DEPENDENCIES | ||
| 277 | stamp | 276 | stamp |
| 278 | therubyracer | 277 | therubyracer |
| 279 | thin | 278 | thin |
| 280 | - timecop | ||
| 281 | turn | 279 | turn |
| 282 | uglifier | 280 | uglifier |
| 283 | will_paginate (~> 3.0) | 281 | will_paginate (~> 3.0) |