Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
e450892f
Commit
e450892f
authored
Apr 14, 2016
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Include GonHelper separately and remove created_at in factory
parent
c7e384aa
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
3 deletions
+2
-3
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+1
-0
app/controllers/oauth/applications_controller.rb
app/controllers/oauth/applications_controller.rb
+1
-0
lib/gitlab/current_settings.rb
lib/gitlab/current_settings.rb
+0
-2
spec/factories/oauth_access_tokens.rb
spec/factories/oauth_access_tokens.rb
+0
-1
No files found.
app/controllers/application_controller.rb
View file @
e450892f
...
@@ -3,6 +3,7 @@ require 'fogbugz'
...
@@ -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
...
...
app/controllers/oauth/applications_controller.rb
View file @
e450892f
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
...
...
lib/gitlab/current_settings.rb
View file @
e450892f
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
...
...
spec/factories/oauth_access_tokens.rb
View file @
e450892f
...
@@ -18,6 +18,5 @@ FactoryGirl.define do
...
@@ -18,6 +18,5 @@ FactoryGirl.define do
resource_owner
resource_owner
application
application
token
'123456'
token
'123456'
created_at
:datetime
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment