Skip to content
Snippets Groups Projects
Commit e450892f authored by Stan Hu's avatar Stan Hu
Browse files

Include GonHelper separately and remove created_at in factory

parent c7e384aa
No related branches found
No related tags found
1 merge request!3690Fix revoking of authorized OAuth applications
Loading
@@ -3,6 +3,7 @@ require 'fogbugz'
Loading
@@ -3,6 +3,7 @@ require 'fogbugz'
   
class ApplicationController < ActionController::Base class ApplicationController < ActionController::Base
include Gitlab::CurrentSettings include Gitlab::CurrentSettings
include Gitlab::GonHelper
include GitlabRoutingHelper include GitlabRoutingHelper
include PageLayoutHelper include PageLayoutHelper
   
Loading
Loading
class Oauth::ApplicationsController < Doorkeeper::ApplicationsController class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
include Gitlab::CurrentSettings include Gitlab::CurrentSettings
include Gitlab::GonHelper
include PageLayoutHelper include PageLayoutHelper
   
before_action :verify_user_oauth_applications_enabled before_action :verify_user_oauth_applications_enabled
Loading
Loading
module Gitlab module Gitlab
module CurrentSettings module CurrentSettings
include ::Gitlab::GonHelper
def current_application_settings def current_application_settings
key = :current_application_settings key = :current_application_settings
   
Loading
Loading
Loading
@@ -18,6 +18,5 @@ FactoryGirl.define do
Loading
@@ -18,6 +18,5 @@ FactoryGirl.define do
resource_owner resource_owner
application application
token '123456' token '123456'
created_at :datetime
end end
end end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment