diff --git a/Gemfile b/Gemfile index c87b63d9e87..535620e83c5 100644 --- a/Gemfile +++ b/Gemfile @@ -72,7 +72,7 @@ gem 'redis', :require => ["redis", "redis/connection/hiredis"] gem 'active_model_serializers' -gem 'onebox', git: 'https://github.com/dysania/onebox.git' +gem 'onebox' gem 'ember-rails' gem 'ember-source', '~> 1.2.0.1' diff --git a/Gemfile_rails4.lock b/Gemfile_rails4.lock index f20e455a60c..e87fbb77c1c 100644 --- a/Gemfile_rails4.lock +++ b/Gemfile_rails4.lock @@ -1,15 +1,3 @@ -GIT - remote: https://github.com/dysania/onebox.git - revision: 6a2f6e6a08f183a4df52f9a51187f566b8ae3a00 - specs: - onebox (1.1.0) - hexpress (~> 1.2) - moneta (~> 0.7) - multi_json (~> 1.7) - mustache (~> 0.99) - nokogiri (~> 1.6.1) - opengraph_parser (~> 0.2.3) - PATH remote: vendor/gems/discourse_plugin specs: @@ -213,6 +201,13 @@ GEM omniauth-twitter (1.0.1) multi_json (~> 1.3) omniauth-oauth (~> 1.0) + onebox (1.2.0) + hexpress (~> 1.2) + moneta (~> 0.7) + multi_json (~> 1.7) + mustache (~> 0.99) + nokogiri (~> 1.6.1) + opengraph_parser (~> 0.2.3) opengraph_parser (0.2.3) addressable nokogiri @@ -431,7 +426,7 @@ DEPENDENCIES omniauth-oauth2 omniauth-openid omniauth-twitter - onebox! + onebox openid-redis-store pg (= 0.15.1) pry-nav