Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
cac2d06e
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cac2d06e
编写于
7月 18, 2018
作者:
L
Luke Bennett
提交者:
Bob Van Landuyt
7月 27, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add instance_statistics_visibility_private application setting and top nav icon
上级
602a1c34
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
35 addition
and
2 deletion
+35
-2
app/controllers/instance_statistics/application_controller.rb
...controllers/instance_statistics/application_controller.rb
+1
-1
app/helpers/application_settings_helper.rb
app/helpers/application_settings_helper.rb
+5
-0
app/models/application_setting.rb
app/models/application_setting.rb
+1
-0
app/views/admin/application_settings/_usage.html.haml
app/views/admin/application_settings/_usage.html.haml
+3
-0
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+5
-1
db/migrate/20180718005113_add_instance_statistics_visibility_to_application_setting.rb
..._instance_statistics_visibility_to_application_setting.rb
+20
-0
未找到文件。
app/controllers/instance_statistics/application_controller.rb
浏览文件 @
cac2d06e
...
...
@@ -9,6 +9,6 @@ class InstanceStatistics::ApplicationController < ApplicationController
end
def
authenticate_user!
render_404
unless
current_user
.
admin?
render_404
if
ApplicationSettingsHelper
.
hide_instance_statistics?
(
current_user
)
end
end
app/helpers/application_settings_helper.rb
浏览文件 @
cac2d06e
...
...
@@ -15,6 +15,10 @@ module ApplicationSettingsHelper
def
allowed_protocols_present?
Gitlab
::
CurrentSettings
.
enabled_git_access_protocol
.
present?
end
def
hide_instance_statistics?
(
user
=
current_user
)
Gitlab
::
CurrentSettings
.
instance_statistics_visibility_private?
&&
!
user
.
admin?
end
def
enabled_protocol
case
Gitlab
::
CurrentSettings
.
enabled_git_access_protocol
...
...
@@ -247,6 +251,7 @@ module ApplicationSettingsHelper
:unique_ips_limit_per_user
,
:unique_ips_limit_time_window
,
:usage_ping_enabled
,
:instance_statistics_visibility_private
,
:user_default_external
,
:user_oauth_applications
,
:version_check_enabled
,
...
...
app/models/application_setting.rb
浏览文件 @
cac2d06e
...
...
@@ -290,6 +290,7 @@ class ApplicationSetting < ActiveRecord::Base
user_default_external:
false
,
polling_interval_multiplier:
1
,
usage_ping_enabled:
Settings
.
gitlab
[
'usage_ping_enabled'
],
instance_statistics_visibility_private:
false
,
gitaly_timeout_fast:
10
,
gitaly_timeout_medium:
30
,
gitaly_timeout_default:
55
,
...
...
app/views/admin/application_settings/_usage.html.haml
浏览文件 @
cac2d06e
...
...
@@ -30,6 +30,9 @@
form. For more information, see the documentation on
=
succeed
'.'
do
=
link_to
'deactivating the usage ping'
,
help_page_path
(
'user/admin_area/settings/usage_statistics'
,
anchor:
'deactivate-the-usage-ping'
)
.form-group
=
f
.
label
:instance_statistics_visibility_private
,
'Instance Statistics visibility'
=
f
.
select
:instance_statistics_visibility_private
,
options_for_select
({
'All users'
=>
false
,
'Only admins'
=>
true
},
Gitlab
::
CurrentSettings
.
instance_statistics_visibility_private?
),
{},
class:
'form-control'
=
f
.
submit
'Save changes'
,
class:
"btn btn-success"
app/views/layouts/nav/_dashboard.html.haml
浏览文件 @
cac2d06e
...
...
@@ -70,8 +70,12 @@
=
nav_link
(
controller:
'admin/dashboard'
)
do
=
link_to
admin_root_path
,
class:
'admin-icon qa-admin-area-link'
,
title:
_
(
'Admin area'
),
aria:
{
label:
_
(
"Admin area"
)
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
sprite_icon
(
'admin'
,
size:
18
)
-
unless
hide_instance_statistics?
=
nav_link
(
controller: :instance_statistics
)
do
=
link_to
instance_statistics_root_path
,
title:
'Instance statistics'
,
aria:
{
label:
'Instance statistics'
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
sprite_icon
(
'chart'
,
size:
18
)
-
if
Gitlab
::
Sherlock
.
enabled?
%li
=
link_to
sherlock_transactions_path
,
class:
'admin-icon'
,
title:
_
(
'Sherlock Transactions'
),
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'tachometer fw'
)
=
icon
(
'tachometer fw'
)
\ No newline at end of file
db/migrate/20180718005113_add_instance_statistics_visibility_to_application_setting.rb
0 → 100644
浏览文件 @
cac2d06e
# frozen_string_literal: true
class
AddInstanceStatisticsVisibilityToApplicationSetting
<
ActiveRecord
::
Migration
include
Gitlab
::
Database
::
MigrationHelpers
DOWNTIME
=
false
disable_ddl_transaction!
def
up
add_column_with_default
(
:application_settings
,
:instance_statistics_visibility_private
,
:boolean
,
default:
false
,
allow_null:
false
)
end
def
down
remove_column
(
:application_settings
,
:instance_statistics_visibility_private
)
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录