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
f2eb234c
Commit
f2eb234c
authored
Jan 16, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix passign args to original authenticate_user!
parent
38600e32
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+2
-2
No files found.
app/controllers/application_controller.rb
View file @
f2eb234c
...
@@ -48,7 +48,7 @@ class ApplicationController < ActionController::Base
...
@@ -48,7 +48,7 @@ class ApplicationController < ActionController::Base
end
end
end
end
def
authenticate_user!
def
authenticate_user!
(
*
args
)
# If user is not signe-in and tries to access root_path - redirect him to landing page
# If user is not signe-in and tries to access root_path - redirect him to landing page
if
current_application_settings
.
home_page_url
.
present?
if
current_application_settings
.
home_page_url
.
present?
if
current_user
.
nil?
&&
controller_name
==
'dashboard'
&&
action_name
==
'show'
if
current_user
.
nil?
&&
controller_name
==
'dashboard'
&&
action_name
==
'show'
...
@@ -56,7 +56,7 @@ class ApplicationController < ActionController::Base
...
@@ -56,7 +56,7 @@ class ApplicationController < ActionController::Base
end
end
end
end
super
super
(
*
args
)
end
end
def
log_exception
(
exception
)
def
log_exception
(
exception
)
...
...
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