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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
0cd09ba2
Commit
0cd09ba2
authored
Nov 29, 2018
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve application controller conflict
parent
815afb28
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
7 deletions
+0
-7
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+0
-7
No files found.
app/controllers/application_controller.rb
View file @
0cd09ba2
...
@@ -153,13 +153,6 @@ class ApplicationController < ActionController::Base
...
@@ -153,13 +153,6 @@ class ApplicationController < ActionController::Base
end
end
end
end
# This filter handles personal access tokens, and atom requests with rss tokens
def
authenticate_sessionless_user!
user
=
Gitlab
::
Auth
::
RequestAuthenticator
.
new
(
request
).
find_sessionless_user
sessionless_sign_in
(
user
)
if
user
end
def
verify_namespace_plan_check_enabled
def
verify_namespace_plan_check_enabled
render_404
unless
Gitlab
::
CurrentSettings
.
should_check_namespace_plan?
render_404
unless
Gitlab
::
CurrentSettings
.
should_check_namespace_plan?
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