diff --git a/Changelog.md b/Changelog.md index 630cefd8f..943bafb7e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -26,6 +26,10 @@ * Allow translation of "suggest member" of Community Spotlight. [#3791](https://github.com/diaspora/diaspora/issues/3791) * Resize deletelabel and ignoreuser images to align them [#3779](https://github.com/diaspora/diaspora/issues/3779) +## Gem Updates + +* Removed `debugger` since it was causing bundle problems, and is not necessary given 1.9.3 has a built-in debugger. + # 0.0.2.0 diff --git a/Gemfile b/Gemfile index 1319f3494..05b4e6a50 100644 --- a/Gemfile +++ b/Gemfile @@ -162,7 +162,6 @@ group :test do end group :test, :development do - gem 'debugger', '1.2.1' gem "rspec-rails", "2.11.4" end diff --git a/Gemfile.lock b/Gemfile.lock index 2b727a537..8bed06f5d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -89,8 +89,6 @@ GEM coffee-script-source execjs coffee-script-source (1.4.0) - columnize (0.3.6) - configurate (0.0.1) crack (0.3.1) cucumber (1.2.1) builder (>= 2.1.2) @@ -102,13 +100,6 @@ GEM cucumber (>= 1.1.8) nokogiri (>= 1.5.0) database_cleaner (0.9.1) - debugger (1.2.1) - columnize (>= 0.3.1) - debugger-linecache (~> 1.1.1) - debugger-ruby_core_source (~> 1.1.4) - debugger-linecache (1.1.2) - debugger-ruby_core_source (>= 1.1.1) - debugger-ruby_core_source (1.1.5) devise (2.1.2) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) @@ -233,7 +224,6 @@ GEM rails multi_json (1.4.0) multipart-post (1.1.5) - mysql2 (0.3.11) nested_form (0.2.3) net-scp (1.0.4) net-ssh (>= 1.99.1) @@ -268,6 +258,7 @@ GEM multi_json (~> 1.3) omniauth-oauth (~> 1.0) orm_adapter (0.4.0) + pg (0.14.1) polyglot (0.3.3) pry (0.9.10) coderay (~> 1.0.5) @@ -436,7 +427,6 @@ DEPENDENCIES configurate (= 0.0.1) cucumber-rails (= 1.3.0) database_cleaner (= 0.9.1) - debugger (= 1.2.1) devise (= 2.1.2) factory_girl_rails (= 4.1.0) faraday (= 0.8.4) @@ -462,12 +452,12 @@ DEPENDENCIES messagebus_ruby_api (= 1.0.3) mini_magick (= 3.4) mobile-fu (= 1.1.0) - mysql2 (= 0.3.11) nokogiri (= 1.5.5) omniauth (= 1.1.1) omniauth-facebook (= 1.4.1) omniauth-tumblr (= 1.1) omniauth-twitter (= 0.0.13) + pg (= 0.14.1) rack-cors (= 0.2.7) rack-google-analytics (= 0.11.0) rack-piwik (= 0.1.3)