Include GonHelper separately and remove created_at in factory
This commit is contained in:
parent
c7e384aab2
commit
e450892f56
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
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
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
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
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,5 @@ FactoryGirl.define do
|
||||||
resource_owner
|
resource_owner
|
||||||
application
|
application
|
||||||
token '123456'
|
token '123456'
|
||||||
created_at :datetime
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue