diff --git a/Gemfile b/Gemfile index 168f90eed..53e1ff79e 100644 --- a/Gemfile +++ b/Gemfile @@ -89,7 +89,6 @@ gem 'ruby-oembed', '~> 0.8.7' gem 'resque', '1.22.0' gem 'resque-timeout', '1.0.0' -gem 'SystemTimer', '1.2.3', :platforms => :ruby_18 # tags @@ -165,18 +164,16 @@ group :test do end group :test, :development do - gem 'debugger', :platforms => :mri_19 + gem 'debugger' gem "rspec-rails", "~> 2.10" - gem 'ruby-debug', :platforms => :mri_18 end group :development do gem 'heroku' - gem 'heroku_san', '3.0.4', :platforms => :mri_19 + gem 'heroku_san', '3.0.4' gem 'capistrano', :require => false gem 'capistrano_colors', :require => false gem 'capistrano-ext', :require => false - gem 'linecache', '0.46', :platforms => :mri_18 gem 'yard', :require => false # for tracing AR object instantiation and memory usage per request diff --git a/Gemfile.lock b/Gemfile.lock index 6511451e2..c6dbd2359 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,7 +51,6 @@ GIT GEM remote: http://rubygems.org/ specs: - SystemTimer (1.2.3) actionmailer (3.2.8) actionpack (= 3.2.8) mail (~> 2.4.4) @@ -258,8 +257,6 @@ GEM launchy (2.1.2) addressable (~> 2.3) libwebsocket (0.1.5) - linecache (0.46) - rbx-require-relative (> 0.0.4) listen (0.4.2) rb-fchange (~> 0.0.5) rb-fsevent (~> 0.9.1) @@ -360,7 +357,6 @@ GEM rb-fsevent (0.9.1) rb-inotify (0.8.8) ffi (>= 0.5.0) - rbx-require-relative (0.0.9) rdoc (3.12) json (~> 1.4) redcarpet (2.1.1) @@ -394,11 +390,6 @@ GEM activesupport (>= 3.0) railties (>= 3.0) rspec (~> 2.11.0) - ruby-debug (0.10.4) - columnize (>= 0.1) - ruby-debug-base (~> 0.10.4.0) - ruby-debug-base (0.10.4) - linecache (>= 0.3) ruby-hmac (0.4.0) ruby-oembed (0.8.7) ruby-progressbar (0.0.10) @@ -465,7 +456,6 @@ PLATFORMS ruby DEPENDENCIES - SystemTimer (= 1.2.3) activerecord-import (~> 0.2.9) acts-as-taggable-on (= 2.3.3) acts_as_api @@ -506,7 +496,6 @@ DEPENDENCIES jasmine! jquery-rails json - linecache (= 0.46) markerb! messagebus_ruby_api (= 1.0.3) mini_magick (= 3.4) @@ -537,7 +526,6 @@ DEPENDENCIES rpm_contrib (~> 2.1.7) rspec-instafail (>= 0.1.7) rspec-rails (~> 2.10) - ruby-debug ruby-oembed (~> 0.8.7) sass-rails (= 3.2.5) selenium-webdriver (~> 2.25)