updated twitter, solr in new instance

fred · Jul 17, 2012 · 9d52158 · 9d52158
1 parent 503cb1d
commit 9d52158
Show file tree

Hide file tree

Showing 27 changed files with 19 additions and 15 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,9 @@
 CHANGELOG
 
+== July 17, 2012
+* Updated Twitter Gem
+* Moved SOLR to new instance
+
 == July 16, 2012
 * Updated Dalli fixing "key too long" error
 

diff --git a/Gemfile b/Gemfile
@@ -53,14 +53,14 @@ gem 'rakismet'
 ### Queue
 gem 'slim'
 gem 'sinatra'
-gem 'redis', '~> 3.0.1'
+gem 'redis'
 gem 'sidekiq', git: 'git://github.com/mperham/sidekiq.git'
 
 ### JSON and Twitter
 gem 'multi_json'
 gem 'json'
-gem 'simple_oauth', '~> 0.1.7'
-gem 'twitter', '~> 2.5.0'
+gem 'simple_oauth'
+gem 'twitter'
 
 gem 'sass'
 gem 'sass-rails'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -64,7 +64,7 @@ GIT
 
 GIT
   remote: git://github.com/mperham/sidekiq.git
-  revision: c232f5e53b2c19e41e75058d49323073f76194cb
+  revision: 169cdea2c8dd6a8e045bc1f5333eaade9babd95d
   specs:
     sidekiq (2.0.3)
       celluloid (~> 0.11.0)
@@ -440,7 +440,7 @@ GEM
       polyglot (>= 0.3.1)
     turn (0.8.3)
       ansi
-    twitter (2.5.0)
+    twitter (3.2.0)
       faraday (~> 0.8)
       multi_json (~> 1.3)
       simple_oauth (~> 0.1.6)
@@ -516,14 +516,14 @@ DEPENDENCIES
   rails_config
   rake
   rakismet
-  redis (~> 3.0.1)
+  redis
   rspec (~> 2.9.0)
   rspec-rails (~> 2.9.0)
   rvm-capistrano
   sass
   sass-rails
   sidekiq!
-  simple_oauth (~> 0.1.7)
+  simple_oauth
   sinatra
   sitemap_generator
   slim
@@ -537,7 +537,7 @@ DEPENDENCIES
   thin
   tinymce-rails (= 3.5.2)
   turn (~> 0.8.3)
-  twitter (~> 2.5.0)
+  twitter
   twitter-bootstrap-rails!
   uglifier (>= 1.2.5)
   unicorn

diff --git a/public/assets/active_admin-94fde01a6235f195b48b11dc1cae5b58.css.gz b/public/assets/active_admin-94fde01a6235f195b48b11dc1cae5b58.css.gz
diff --git a/public/assets/active_admin-cf45bae06391cb28801723bdf3660383.js.gz b/public/assets/active_admin-cf45bae06391cb28801723bdf3660383.js.gz
diff --git a/public/assets/active_admin.css.gz b/public/assets/active_admin.css.gz
diff --git a/public/assets/active_admin.js.gz b/public/assets/active_admin.js.gz
diff --git a/public/assets/active_admin/application-6ceda730647770889700c53523cc15ff.js.gz b/public/assets/active_admin/application-6ceda730647770889700c53523cc15ff.js.gz
diff --git a/public/assets/active_admin/application.js.gz b/public/assets/active_admin/application.js.gz
diff --git a/public/assets/active_admin/pages/application-f685456c48c9b6a91ce09c68f2821440.js.gz b/public/assets/active_admin/pages/application-f685456c48c9b6a91ce09c68f2821440.js.gz
diff --git a/public/assets/active_admin/pages/application.js.gz b/public/assets/active_admin/pages/application.js.gz
diff --git a/public/assets/active_admin/print-d934cd71d0936f01793678816c4ff1b8.css.gz b/public/assets/active_admin/print-d934cd71d0936f01793678816c4ff1b8.css.gz
diff --git a/public/assets/active_admin/print.css.gz b/public/assets/active_admin/print.css.gz
diff --git a/public/assets/application-1b55c74c6c229251ca03649bb076bbbe.js.gz b/public/assets/application-1b55c74c6c229251ca03649bb076bbbe.js.gz
diff --git a/...ation-1b55c74c6c229251ca03649bb076bbbe.js → ...ation-27ff4f085b297cab09f0d8c5999e6aae.js b/...ation-1b55c74c6c229251ca03649bb076bbbe.js → ...ation-27ff4f085b297cab09f0d8c5999e6aae.js
diff --git a/public/assets/application-27ff4f085b297cab09f0d8c5999e6aae.js.gz b/public/assets/application-27ff4f085b297cab09f0d8c5999e6aae.js.gz
diff --git a/public/assets/application-934748781977b3424e1e91cecc4e95de.css.gz b/public/assets/application-934748781977b3424e1e91cecc4e95de.css.gz
diff --git a/public/assets/application.css.gz b/public/assets/application.css.gz
diff --git a/public/assets/application.js b/public/assets/application.js
diff --git a/public/assets/application.js.gz b/public/assets/application.js.gz
diff --git a/public/assets/manifest.yml b/public/assets/manifest.yml
@@ -194,7 +194,7 @@ rss_blue_32.png: rss_blue_32-6c6e400b6d21ef3c0040a913ce78a22c.png
 rss_icon_glass_blue64.png: rss_icon_glass_blue64-deed2260585ed3bb754b60d14154154a.png
 world_mathaba11.png: world_mathaba11-05570f0309b7b69f11ada4c845795333.png
 active_admin.js: active_admin-cf45bae06391cb28801723bdf3660383.js
-application.js: application-1b55c74c6c229251ca03649bb076bbbe.js
+application.js: application-27ff4f085b297cab09f0d8c5999e6aae.js
 active_admin.css: active_admin-94fde01a6235f195b48b11dc1cae5b58.css
 application.css: application-934748781977b3424e1e91cecc4e95de.css
 rss.css: rss-5d88525bfa6012a6fe5cdf6dd949a96f.css

diff --git a/public/assets/rss-5d88525bfa6012a6fe5cdf6dd949a96f.css.gz b/public/assets/rss-5d88525bfa6012a6fe5cdf6dd949a96f.css.gz
diff --git a/public/assets/rss.css.gz b/public/assets/rss.css.gz
diff --git a/public/assets/tinymce-3a5968756d6bba8bea1b751efd89b1d9.css.gz b/public/assets/tinymce-3a5968756d6bba8bea1b751efd89b1d9.css.gz
diff --git a/public/assets/tinymce-fc793bc9587330b37f07f2b97745be71.js.gz b/public/assets/tinymce-fc793bc9587330b37f07f2b97745be71.js.gz
diff --git a/public/assets/tinymce.css.gz b/public/assets/tinymce.css.gz
diff --git a/public/assets/tinymce.js.gz b/public/assets/tinymce.js.gz