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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
4a49a937
Commit
4a49a937
authored
Jan 16, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow to specify home page for non logged-in users
parent
4fcc3d6b
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
28 additions
and
9 deletions
+28
-9
app/controllers/admin/application_settings_controller.rb
app/controllers/admin/application_settings_controller.rb
+1
-0
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+11
-0
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+0
-5
app/models/application_setting.rb
app/models/application_setting.rb
+3
-0
app/views/admin/application_settings/_form.html.haml
app/views/admin/application_settings/_form.html.haml
+4
-0
app/views/layouts/devise.html.haml
app/views/layouts/devise.html.haml
+1
-2
db/migrate/20150116234544_add_home_page_url_for_application_settings.rb
...50116234544_add_home_page_url_for_application_settings.rb
+5
-0
db/schema.rb
db/schema.rb
+3
-2
No files found.
app/controllers/admin/application_settings_controller.rb
View file @
4a49a937
...
...
@@ -26,6 +26,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:signin_enabled
,
:gravatar_enabled
,
:sign_in_text
,
:home_page_url
)
end
end
app/controllers/application_controller.rb
View file @
4a49a937
...
...
@@ -48,6 +48,17 @@ class ApplicationController < ActionController::Base
end
end
def
authenticate_user!
# 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_user
.
nil?
&&
controller_name
==
'dashboard'
&&
action_name
==
'show'
redirect_to
current_application_settings
.
home_page_url
and
return
end
end
super
end
def
log_exception
(
exception
)
application_trace
=
ActionDispatch
::
ExceptionWrapper
.
new
(
env
,
exception
).
application_trace
application_trace
.
map!
{
|
t
|
"
#{
t
}
\n
"
}
...
...
app/helpers/application_helper.rb
View file @
4a49a937
...
...
@@ -305,9 +305,4 @@ module ApplicationHelper
profile_key_path
(
key
)
end
end
def
redirect_from_root?
request
.
env
[
'rack.session'
][
'user_return_to'
]
==
'/'
end
end
app/models/application_setting.rb
View file @
4a49a937
class
ApplicationSetting
<
ActiveRecord
::
Base
validates
:home_page_url
,
allow_blank:
true
,
format:
{
with:
URI
::
regexp
(
%w(http https)
),
message:
"should be a valid url"
}
def
self
.
current
ApplicationSetting
.
last
end
...
...
app/views/admin/application_settings/_form.html.haml
View file @
4a49a937
...
...
@@ -25,6 +25,10 @@
=
f
.
label
:default_projects_limit
,
class:
'control-label'
.col-sm-10
=
f
.
number_field
:default_projects_limit
,
class:
'form-control'
.form-group
=
f
.
label
:home_page_url
,
class:
'control-label'
.col-sm-10
=
f
.
text_field
:home_page_url
,
class:
'form-control'
,
placeholder:
'http://company.example.com'
.form-group
=
f
.
label
:sign_in_text
,
class:
'control-label'
.col-sm-10
...
...
app/views/layouts/devise.html.haml
View file @
4a49a937
...
...
@@ -6,8 +6,7 @@
=
render
"layouts/public_head_panel"
,
title:
''
.container.navless-container
.content
-
unless
redirect_from_root?
=
render
"layouts/flash"
=
render
"layouts/flash"
.row.prepend-top-20
.col-sm-5.pull-right
=
yield
...
...
db/migrate/20150116234544_add_home_page_url_for_application_settings.rb
0 → 100644
View file @
4a49a937
class
AddHomePageUrlForApplicationSettings
<
ActiveRecord
::
Migration
def
change
add_column
:application_settings
,
:home_page_url
,
:string
end
end
db/schema.rb
View file @
4a49a937
...
...
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
201501
08073740
)
do
ActiveRecord
::
Schema
.
define
(
version:
201501
16234544
)
do
# These are extensions that must be enabled in order to support this database
enable_extension
"plpgsql"
...
...
@@ -24,6 +24,7 @@ ActiveRecord::Schema.define(version: 20150108073740) do
t
.
text
"sign_in_text"
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
t
.
string
"home_page_url"
end
create_table
"broadcast_messages"
,
force:
true
do
|
t
|
...
...
@@ -423,6 +424,7 @@ ActiveRecord::Schema.define(version: 20150108073740) do
t
.
integer
"notification_level"
,
default:
1
,
null:
false
t
.
datetime
"password_expires_at"
t
.
integer
"created_by_id"
t
.
datetime
"last_credential_check_at"
t
.
string
"avatar"
t
.
string
"confirmation_token"
t
.
datetime
"confirmed_at"
...
...
@@ -430,7 +432,6 @@ ActiveRecord::Schema.define(version: 20150108073740) do
t
.
string
"unconfirmed_email"
t
.
boolean
"hide_no_ssh_key"
,
default:
false
t
.
string
"website_url"
,
default:
""
,
null:
false
t
.
datetime
"last_credential_check_at"
t
.
string
"github_access_token"
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