Commit e450892f authored by Stan Hu's avatar Stan Hu

Include GonHelper separately and remove created_at in factory

parent c7e384aa
......@@ -3,6 +3,7 @@ require 'fogbugz'
class ApplicationController < ActionController::Base
include Gitlab::CurrentSettings
include Gitlab::GonHelper
include GitlabRoutingHelper
include PageLayoutHelper
......
class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
include Gitlab::CurrentSettings
include Gitlab::GonHelper
include PageLayoutHelper
before_action :verify_user_oauth_applications_enabled
......
module Gitlab
module CurrentSettings
include ::Gitlab::GonHelper
def current_application_settings
key = :current_application_settings
......
......@@ -18,6 +18,5 @@ FactoryGirl.define do
resource_owner
application
token '123456'
created_at :datetime
end
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment