diff --git a/Gemfile b/Gemfile index 5cc667832..5f533d3ca 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,6 @@ gem 'devise', '~> 1.5.2' gem 'omniauth', '~> 1.0.1' gem 'omniauth-openid', '~> 1.0.1' gem 'cancan', '~> 1.6.7' -#gem 'bitmask_attributes' gem "haml-rails", '~> 0.3.4' # gem "compass", '~> 0.11.5' # update when it will be needed @@ -24,7 +23,6 @@ gem "will_paginate", "~> 3.0.2" gem 'meta-tags', '~> 1.2.4', :require => 'meta_tags' gem "russian" -# gem 'ghoul_grack', '~> 0.0.1' gem 'grack', :git => 'git://github.com/rdblue/grack.git', :require => 'git_http' gem "grit" gem 'whenever', :require => false @@ -32,18 +30,17 @@ gem 'delayed_job' gem 'highline', '~> 1.6.8' # XML-RPC support -# gem 'actionwebservice' #, :git => 'git://github.com/ywen/actionwebservice.git' gem "rails-xmlrpc", '~> 0.3.6' # :git => 'git://github.com/chipiga/rails-xmlrpc.git' -# gem 'passenger', '~> 3.0.11' gem 'unicorn', '~> 4.1.1' group :production do gem "airbrake", '~> 3.0.5' - gem 'newrelic_rpm' gem 'bluepill', :require => false end +gem 'newrelic_rpm' + group :development do # gem 'letter_opener' gem 'rails3-generators' @@ -51,25 +48,16 @@ group :development do gem 'hpricot' gem 'ruby_parser' - # debug - # gem 'ruby-debug19', :require => 'ruby-debug', :platforms => :mri_19 - # gem 'looksee' - # gem 'awesome_print' -# gem 'wirble' gem 'hirb' - # gem 'rails-footnotes', '>= 3.7.5.rc4' # this shit is very buggy don't forget to switch it off back # deploy gem 'capistrano', :require => false gem 'capistrano-ext', :require => false gem 'cape', :require => false - # gem 'capistrano-exts', :require => false #, :git => 'git://github.com/chipiga/capistrano-exts.git' - # gem 'capistrano-recipes', :require => false gem 'capistrano_colors', :require => false end group :development, :test do - gem 'mysql2', '<= 0.2.9' gem 'rspec-rails', '~> 2.7.0' gem 'factory_girl_rails', '~> 1.4.0' gem 'rr' diff --git a/Gemfile.lock b/Gemfile.lock index d7f4c2d08..176b2436d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -102,7 +102,6 @@ GEM meta-tags (1.2.4) actionpack mime-types (1.17.2) - mysql2 (0.2.9) net-scp (1.0.4) net-ssh (>= 1.99.1) net-sftp (2.0.5) @@ -223,7 +222,6 @@ DEPENDENCIES hpricot jammit meta-tags (~> 1.2.4) - mysql2 (<= 0.2.9) newrelic_rpm omniauth (~> 1.0.1) omniauth-openid (~> 1.0.1)