diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-04-14 05:28:46 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-04-14 07:25:27 -0700 |
| commit | e450892f5688529b8a49e3ae7598f00dbdda7161 (patch) | |
| tree | c146f3c3bd314bb625c24b9dc4bfaa0ac6c6efeb | |
| parent | c7e384aab23301ad0ee3559252324fa957d15db3 (diff) | |
| download | gitlab-ce-e450892f5688529b8a49e3ae7598f00dbdda7161.tar.gz | |
Include GonHelper separately and remove created_at in factory
| -rw-r--r-- | app/controllers/application_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/oauth/applications_controller.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/current_settings.rb | 2 | ||||
| -rw-r--r-- | spec/factories/oauth_access_tokens.rb | 1 |
4 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index bdf2dd68531..ce5c84ee9bc 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -3,6 +3,7 @@ require 'fogbugz' class ApplicationController < ActionController::Base include Gitlab::CurrentSettings + include Gitlab::GonHelper include GitlabRoutingHelper include PageLayoutHelper diff --git a/app/controllers/oauth/applications_controller.rb b/app/controllers/oauth/applications_controller.rb index 377fef65a92..c6bdd0602c1 100644 --- a/app/controllers/oauth/applications_controller.rb +++ b/app/controllers/oauth/applications_controller.rb @@ -1,5 +1,6 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController include Gitlab::CurrentSettings + include Gitlab::GonHelper include PageLayoutHelper before_action :verify_user_oauth_applications_enabled diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 71b53136ed2..1acc22fe5bf 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -1,7 +1,5 @@ module Gitlab module CurrentSettings - include ::Gitlab::GonHelper - def current_application_settings key = :current_application_settings diff --git a/spec/factories/oauth_access_tokens.rb b/spec/factories/oauth_access_tokens.rb index 4bbc7d3a554..7700b15d538 100644 --- a/spec/factories/oauth_access_tokens.rb +++ b/spec/factories/oauth_access_tokens.rb @@ -18,6 +18,5 @@ FactoryGirl.define do resource_owner application token '123456' - created_at :datetime end end |