[myexperiment-hackers] [3133] branches/wf4ever: removed reference to oauth_plugin as a plugin and added require to avoid load order issues

[noreply]

Revision

3133

Author

dgc

Date

2012-09-23 21:35:46 +0000 (Sun, 23 Sep 2012)

Log Message

removed reference to oauth_plugin as a plugin and added require to avoid load order issues

Modified Paths

• branches/wf4ever/app/controllers/oauth_controller.rb
• branches/wf4ever/config/environment.rb

Diff

Modified: branches/wf4ever/app/controllers/oauth_controller.rb (3132 => 3133)

--- branches/wf4ever/app/controllers/oauth_controller.rb	2012-09-23 21:34:55 UTC (rev 3132)
+++ branches/wf4ever/app/controllers/oauth_controller.rb	2012-09-23 21:35:46 UTC (rev 3133)
@@ -1,3 +1,4 @@
+require 'oauth-plugin'
 require 'oauth/controllers/provider_controller'
 class OauthController < ApplicationController
   include OAuth::Controllers::ProviderController

Modified: branches/wf4ever/config/environment.rb (3132 => 3133)

--- branches/wf4ever/config/environment.rb	2012-09-23 21:34:55 UTC (rev 3132)
+++ branches/wf4ever/config/environment.rb	2012-09-23 21:35:46 UTC (rev 3133)
@@ -46,7 +46,6 @@
     :mannie_taverna_scufl,
     :mannie_taverna_t2flow,
     :oauth,
-    :oauth_plugin,
     :open_id_authentication,
     :paginating_find,
     :qrcode,