diff --git a/Gemfile b/Gemfile index 7bbc5ee5..7e2e97e0 100644 --- a/Gemfile +++ b/Gemfile @@ -40,10 +40,8 @@ gem 'bcrypt-ruby', "~>3.0" group :development do if RUBY_VERSION.to_f >= 1.9 # gem "ruby-debug19", :require => 'ruby-debug' - gem "mongrel", ">=1.2.0.pre2" else gem "ruby-debug" - gem "mongrel" end gem "yard", "~>0.8" gem "tolk", "~>1.3" diff --git a/Gemfile.lock b/Gemfile.lock index 1995c053..275955e9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,7 +73,6 @@ GEM capybara (>= 1.1.2) cucumber (>= 1.1.8) nokogiri (>= 1.5.0) - daemons (1.0.10) database_cleaner (0.9.1) diff-lcs (1.1.3) erubis (2.7.0) @@ -89,7 +88,6 @@ GEM RedCloth (~> 4.2) actionpack (~> 3.0) bluecloth (~> 2.2) - gem_plugin (0.2.3) gherkin (2.11.5) json (>= 1.4.6) hike (1.2.1) @@ -109,9 +107,6 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.19) - mongrel (1.2.0.pre2) - daemons (~> 1.0.10) - gem_plugin (~> 0.2.3) multi_json (1.5.0) mysql2 (0.3.11) nokogiri (1.5.6) @@ -217,7 +212,6 @@ DEPENDENCIES formatize (~> 1.1) htmlentities (~> 4.3) jquery-rails (~> 2.1) - mongrel (>= 1.2.0.pre2) mysql2 (~> 0.3) rack-mini-profiler (~> 0.1) rails (~> 3.2)