Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
60011bc4
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,发现更多精彩内容 >>
提交
60011bc4
编写于
12月 06, 2018
作者:
K
Kamil Trzciński
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'ce-revert-gold-trial-mrs' into 'master'
[CE] Revert Gold Trial MRs See merge request gitlab-org/gitlab-ce!23619
上级
966e242e
37e51c06
变更
21
隐藏空白更改
内联
并排
Showing
21 changed file
with
39 addition
and
93 deletion
+39
-93
app/assets/javascripts/clusters/clusters_bundle.js
app/assets/javascripts/clusters/clusters_bundle.js
+2
-8
app/assets/javascripts/dismissable_callout.js
app/assets/javascripts/dismissable_callout.js
+27
-0
app/assets/javascripts/pages/groups/clusters/index/index.js
app/assets/javascripts/pages/groups/clusters/index/index.js
+2
-4
app/assets/javascripts/pages/groups/index.js
app/assets/javascripts/pages/groups/index.js
+2
-8
app/assets/javascripts/pages/projects/clusters/index/index.js
...assets/javascripts/pages/projects/clusters/index/index.js
+2
-4
app/assets/javascripts/pages/projects/index.js
app/assets/javascripts/pages/projects/index.js
+2
-4
app/assets/javascripts/pages/root/index.js
app/assets/javascripts/pages/root/index.js
+0
-5
app/assets/javascripts/persistent_user_callout.js
app/assets/javascripts/persistent_user_callout.js
+0
-34
app/views/clusters/clusters/_gcp_signup_offer_banner.html.haml
...iews/clusters/clusters/_gcp_signup_offer_banner.html.haml
+2
-2
app/views/dashboard/activity.html.haml
app/views/dashboard/activity.html.haml
+0
-3
app/views/dashboard/groups/index.html.haml
app/views/dashboard/groups/index.html.haml
+0
-2
app/views/dashboard/issues.html.haml
app/views/dashboard/issues.html.haml
+0
-2
app/views/dashboard/merge_requests.html.haml
app/views/dashboard/merge_requests.html.haml
+0
-2
app/views/dashboard/projects/index.html.haml
app/views/dashboard/projects/index.html.haml
+0
-2
app/views/dashboard/projects/starred.html.haml
app/views/dashboard/projects/starred.html.haml
+0
-2
app/views/dashboard/todos/index.html.haml
app/views/dashboard/todos/index.html.haml
+0
-2
app/views/explore/groups/index.html.haml
app/views/explore/groups/index.html.haml
+0
-2
app/views/explore/projects/index.html.haml
app/views/explore/projects/index.html.haml
+0
-2
app/views/explore/projects/starred.html.haml
app/views/explore/projects/starred.html.haml
+0
-2
app/views/explore/projects/trending.html.haml
app/views/explore/projects/trending.html.haml
+0
-2
spec/features/dashboard/merge_requests_spec.rb
spec/features/dashboard/merge_requests_spec.rb
+0
-1
未找到文件。
app/assets/javascripts/clusters/clusters_bundle.js
浏览文件 @
60011bc4
import
Visibility
from
'
visibilityjs
'
;
import
Visibility
from
'
visibilityjs
'
;
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
PersistentUserCallout
from
'
../persistent_user
_callout
'
;
import
initDismissableCallout
from
'
~/dismissable
_callout
'
;
import
{
s__
,
sprintf
}
from
'
../locale
'
;
import
{
s__
,
sprintf
}
from
'
../locale
'
;
import
Flash
from
'
../flash
'
;
import
Flash
from
'
../flash
'
;
import
Poll
from
'
../lib/utils/poll
'
;
import
Poll
from
'
../lib/utils/poll
'
;
...
@@ -67,7 +67,7 @@ export default class Clusters {
...
@@ -67,7 +67,7 @@ export default class Clusters {
this
.
showTokenButton
=
document
.
querySelector
(
'
.js-show-cluster-token
'
);
this
.
showTokenButton
=
document
.
querySelector
(
'
.js-show-cluster-token
'
);
this
.
tokenField
=
document
.
querySelector
(
'
.js-cluster-token
'
);
this
.
tokenField
=
document
.
querySelector
(
'
.js-cluster-token
'
);
Clusters
.
initDismissableCallout
(
);
initDismissableCallout
(
'
.js-cluster-security-warning
'
);
initSettingsPanels
();
initSettingsPanels
();
setupToggleButtons
(
document
.
querySelector
(
'
.js-cluster-enable-toggle-area
'
));
setupToggleButtons
(
document
.
querySelector
(
'
.js-cluster-enable-toggle-area
'
));
this
.
initApplications
(
clusterType
);
this
.
initApplications
(
clusterType
);
...
@@ -108,12 +108,6 @@ export default class Clusters {
...
@@ -108,12 +108,6 @@ export default class Clusters {
});
});
}
}
static
initDismissableCallout
()
{
const
callout
=
document
.
querySelector
(
'
.js-cluster-security-warning
'
);
if
(
callout
)
new
PersistentUserCallout
(
callout
);
// eslint-disable-line no-new
}
addListeners
()
{
addListeners
()
{
if
(
this
.
showTokenButton
)
this
.
showTokenButton
.
addEventListener
(
'
click
'
,
this
.
showToken
);
if
(
this
.
showTokenButton
)
this
.
showTokenButton
.
addEventListener
(
'
click
'
,
this
.
showToken
);
eventHub
.
$on
(
'
installApplication
'
,
this
.
installApplication
);
eventHub
.
$on
(
'
installApplication
'
,
this
.
installApplication
);
...
...
app/assets/javascripts/dismissable_callout.js
0 → 100644
浏览文件 @
60011bc4
import
$
from
'
jquery
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
{
__
}
from
'
~/locale
'
;
import
Flash
from
'
~/flash
'
;
export
default
function
initDismissableCallout
(
alertSelector
)
{
const
alertEl
=
document
.
querySelector
(
alertSelector
);
if
(
!
alertEl
)
{
return
;
}
const
closeButtonEl
=
alertEl
.
getElementsByClassName
(
'
close
'
)[
0
];
const
{
dismissEndpoint
,
featureId
}
=
closeButtonEl
.
dataset
;
closeButtonEl
.
addEventListener
(
'
click
'
,
()
=>
{
axios
.
post
(
dismissEndpoint
,
{
feature_name
:
featureId
,
})
.
then
(()
=>
{
$
(
alertEl
).
alert
(
'
close
'
);
})
.
catch
(()
=>
{
Flash
(
__
(
'
An error occurred while dismissing the alert. Refresh the page and try again.
'
));
});
});
}
app/assets/javascripts/pages/groups/clusters/index/index.js
浏览文件 @
60011bc4
import
PersistentUserCallout
from
'
~/persistent_user
_callout
'
;
import
initDismissableCallout
from
'
~/dismissable
_callout
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
const
callout
=
document
.
querySelector
(
'
.gcp-signup-offer
'
);
initDismissableCallout
(
'
.gcp-signup-offer
'
);
if
(
callout
)
new
PersistentUserCallout
(
callout
);
// eslint-disable-line no-new
});
});
app/assets/javascripts/pages/groups/index.js
浏览文件 @
60011bc4
import
PersistentUserCallout
from
'
~/persistent_user
_callout
'
;
import
initDismissableCallout
from
'
~/dismissable
_callout
'
;
import
initGkeDropdowns
from
'
~/projects/gke_cluster_dropdowns
'
;
import
initGkeDropdowns
from
'
~/projects/gke_cluster_dropdowns
'
;
function
initCallout
()
{
const
callout
=
document
.
querySelector
(
'
.gcp-signup-offer
'
);
if
(
callout
)
new
PersistentUserCallout
(
callout
);
// eslint-disable-line no-new
}
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
const
{
page
}
=
document
.
body
.
dataset
;
const
{
page
}
=
document
.
body
.
dataset
;
const
newClusterViews
=
[
const
newClusterViews
=
[
...
@@ -16,7 +10,7 @@ document.addEventListener('DOMContentLoaded', () => {
...
@@ -16,7 +10,7 @@ document.addEventListener('DOMContentLoaded', () => {
];
];
if
(
newClusterViews
.
indexOf
(
page
)
>
-
1
)
{
if
(
newClusterViews
.
indexOf
(
page
)
>
-
1
)
{
init
Callout
(
);
init
DismissableCallout
(
'
.gcp-signup-offer
'
);
initGkeDropdowns
();
initGkeDropdowns
();
}
}
});
});
app/assets/javascripts/pages/projects/clusters/index/index.js
浏览文件 @
60011bc4
import
PersistentUserCallout
from
'
~/persistent_user
_callout
'
;
import
initDismissableCallout
from
'
~/dismissable
_callout
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
const
callout
=
document
.
querySelector
(
'
.gcp-signup-offer
'
);
initDismissableCallout
(
'
.gcp-signup-offer
'
);
if
(
callout
)
new
PersistentUserCallout
(
callout
);
// eslint-disable-line no-new
});
});
app/assets/javascripts/pages/projects/index.js
浏览文件 @
60011bc4
import
initDismissableCallout
from
'
~/dismissable_callout
'
;
import
initGkeDropdowns
from
'
~/projects/gke_cluster_dropdowns
'
;
import
initGkeDropdowns
from
'
~/projects/gke_cluster_dropdowns
'
;
import
PersistentUserCallout
from
'
../../persistent_user_callout
'
;
import
Project
from
'
./project
'
;
import
Project
from
'
./project
'
;
import
ShortcutsNavigation
from
'
../../behaviors/shortcuts/shortcuts_navigation
'
;
import
ShortcutsNavigation
from
'
../../behaviors/shortcuts/shortcuts_navigation
'
;
...
@@ -12,9 +12,7 @@ document.addEventListener('DOMContentLoaded', () => {
...
@@ -12,9 +12,7 @@ document.addEventListener('DOMContentLoaded', () => {
];
];
if
(
newClusterViews
.
indexOf
(
page
)
>
-
1
)
{
if
(
newClusterViews
.
indexOf
(
page
)
>
-
1
)
{
const
callout
=
document
.
querySelector
(
'
.gcp-signup-offer
'
);
initDismissableCallout
(
'
.gcp-signup-offer
'
);
if
(
callout
)
new
PersistentUserCallout
(
callout
);
// eslint-disable-line no-new
initGkeDropdowns
();
initGkeDropdowns
();
}
}
...
...
app/assets/javascripts/pages/root/index.js
已删除
100644 → 0
浏览文件 @
966e242e
// if the "projects dashboard" is a user's default dashboard, when they visit the
// instance root index, the dashboard will be served by the root controller instead
// of a dashboard controller. The root index redirects for all other default dashboards.
import
'
../dashboard/projects/index
'
;
app/assets/javascripts/persistent_user_callout.js
已删除
100644 → 0
浏览文件 @
966e242e
import
axios
from
'
./lib/utils/axios_utils
'
;
import
{
__
}
from
'
./locale
'
;
import
Flash
from
'
./flash
'
;
export
default
class
PersistentUserCallout
{
constructor
(
container
)
{
const
{
dismissEndpoint
,
featureId
}
=
container
.
dataset
;
this
.
container
=
container
;
this
.
dismissEndpoint
=
dismissEndpoint
;
this
.
featureId
=
featureId
;
this
.
init
();
}
init
()
{
const
closeButton
=
this
.
container
.
querySelector
(
'
.js-close
'
);
closeButton
.
addEventListener
(
'
click
'
,
event
=>
this
.
dismiss
(
event
));
}
dismiss
(
event
)
{
event
.
preventDefault
();
axios
.
post
(
this
.
dismissEndpoint
,
{
feature_name
:
this
.
featureId
,
})
.
then
(()
=>
{
this
.
container
.
remove
();
})
.
catch
(()
=>
{
Flash
(
__
(
'
An error occurred while dismissing the alert. Refresh the page and try again.
'
));
});
}
}
app/views/clusters/clusters/_gcp_signup_offer_banner.html.haml
浏览文件 @
60011bc4
-
link
=
link_to
(
s_
(
'ClusterIntegration|sign up'
),
'https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral'
,
target:
'_blank'
,
rel:
'noopener noreferrer'
)
-
link
=
link_to
(
s_
(
'ClusterIntegration|sign up'
),
'https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral'
,
target:
'_blank'
,
rel:
'noopener noreferrer'
)
.bs-callout.gcp-signup-offer.alert.alert-block.alert-dismissable.prepend-top-default.append-bottom-default
{
role:
'alert'
,
data:
{
feature_id:
UserCalloutsHelper
::
GCP_SIGNUP_OFFER
,
dismiss_endpoint:
user_callouts_path
}
}
.bs-callout.gcp-signup-offer.alert.alert-block.alert-dismissable.prepend-top-default.append-bottom-default
{
role:
'alert'
}
%button
.close
.js-close
{
type:
"button"
}
×
%button
.close
{
type:
"button"
,
data:
{
feature_id:
UserCalloutsHelper
::
GCP_SIGNUP_OFFER
,
dismiss_endpoint:
user_callouts_path
}
}
×
.gcp-signup-offer--content
.gcp-signup-offer--content
.gcp-signup-offer--icon.append-right-8
.gcp-signup-offer--icon.append-right-8
=
sprite_icon
(
"information"
,
size:
16
)
=
sprite_icon
(
"information"
,
size:
16
)
...
...
app/views/dashboard/activity.html.haml
浏览文件 @
60011bc4
...
@@ -4,9 +4,6 @@
...
@@ -4,9 +4,6 @@
=
content_for
:meta_tags
do
=
content_for
:meta_tags
do
=
auto_discovery_link_tag
(
:atom
,
dashboard_projects_url
(
rss_url_options
),
title:
"All activity"
)
=
auto_discovery_link_tag
(
:atom
,
dashboard_projects_url
(
rss_url_options
),
title:
"All activity"
)
=
render_if_exists
"shared/gold_trial_callout"
-
page_title
"Activity"
-
page_title
"Activity"
-
header_title
"Activity"
,
activity_dashboard_path
-
header_title
"Activity"
,
activity_dashboard_path
...
...
app/views/dashboard/groups/index.html.haml
浏览文件 @
60011bc4
-
@hide_top_links
=
true
-
@hide_top_links
=
true
-
page_title
"Groups"
-
page_title
"Groups"
-
header_title
"Groups"
,
dashboard_groups_path
-
header_title
"Groups"
,
dashboard_groups_path
=
render_if_exists
"shared/gold_trial_callout"
=
render
'dashboard/groups_head'
=
render
'dashboard/groups_head'
-
if
params
[
:filter
].
blank?
&&
@groups
.
empty?
-
if
params
[
:filter
].
blank?
&&
@groups
.
empty?
...
...
app/views/dashboard/issues.html.haml
浏览文件 @
60011bc4
...
@@ -4,8 +4,6 @@
...
@@ -4,8 +4,6 @@
=
content_for
:meta_tags
do
=
content_for
:meta_tags
do
=
auto_discovery_link_tag
(
:atom
,
safe_params
.
merge
(
rss_url_options
).
to_h
,
title:
"
#{
current_user
.
name
}
issues"
)
=
auto_discovery_link_tag
(
:atom
,
safe_params
.
merge
(
rss_url_options
).
to_h
,
title:
"
#{
current_user
.
name
}
issues"
)
=
render_if_exists
"shared/gold_trial_callout"
.page-title-holder
.page-title-holder
%h1
.page-title
=
_
(
'Issues'
)
%h1
.page-title
=
_
(
'Issues'
)
...
...
app/views/dashboard/merge_requests.html.haml
浏览文件 @
60011bc4
...
@@ -2,8 +2,6 @@
...
@@ -2,8 +2,6 @@
-
page_title
_
(
"Merge Requests"
)
-
page_title
_
(
"Merge Requests"
)
-
@breadcrumb_link
=
merge_requests_dashboard_path
(
assignee_username:
current_user
.
username
)
-
@breadcrumb_link
=
merge_requests_dashboard_path
(
assignee_username:
current_user
.
username
)
=
render_if_exists
"shared/gold_trial_callout"
.page-title-holder
.page-title-holder
%h1
.page-title
=
_
(
'Merge Requests'
)
%h1
.page-title
=
_
(
'Merge Requests'
)
...
...
app/views/dashboard/projects/index.html.haml
浏览文件 @
60011bc4
...
@@ -4,8 +4,6 @@
...
@@ -4,8 +4,6 @@
=
content_for
:meta_tags
do
=
content_for
:meta_tags
do
=
auto_discovery_link_tag
(
:atom
,
dashboard_projects_url
(
rss_url_options
),
title:
"All activity"
)
=
auto_discovery_link_tag
(
:atom
,
dashboard_projects_url
(
rss_url_options
),
title:
"All activity"
)
=
render_if_exists
"shared/gold_trial_callout"
-
page_title
"Projects"
-
page_title
"Projects"
-
header_title
"Projects"
,
dashboard_projects_path
-
header_title
"Projects"
,
dashboard_projects_path
...
...
app/views/dashboard/projects/starred.html.haml
浏览文件 @
60011bc4
...
@@ -4,8 +4,6 @@
...
@@ -4,8 +4,6 @@
-
page_title
"Starred Projects"
-
page_title
"Starred Projects"
-
header_title
"Projects"
,
dashboard_projects_path
-
header_title
"Projects"
,
dashboard_projects_path
=
render_if_exists
"shared/gold_trial_callout"
%div
{
class:
container_class
}
%div
{
class:
container_class
}
=
render
"projects/last_push"
=
render
"projects/last_push"
=
render
'dashboard/projects_head'
=
render
'dashboard/projects_head'
...
...
app/views/dashboard/todos/index.html.haml
浏览文件 @
60011bc4
...
@@ -2,8 +2,6 @@
...
@@ -2,8 +2,6 @@
-
page_title
"Todos"
-
page_title
"Todos"
-
header_title
"Todos"
,
dashboard_todos_path
-
header_title
"Todos"
,
dashboard_todos_path
=
render_if_exists
"shared/gold_trial_callout"
.page-title-holder
.page-title-holder
%h1
.page-title
=
_
(
'Todos'
)
%h1
.page-title
=
_
(
'Todos'
)
...
...
app/views/explore/groups/index.html.haml
浏览文件 @
60011bc4
...
@@ -2,8 +2,6 @@
...
@@ -2,8 +2,6 @@
-
page_title
_
(
"Groups"
)
-
page_title
_
(
"Groups"
)
-
header_title
_
(
"Groups"
),
dashboard_groups_path
-
header_title
_
(
"Groups"
),
dashboard_groups_path
=
render_if_exists
"shared/gold_trial_callout"
-
if
current_user
-
if
current_user
=
render
'dashboard/groups_head'
=
render
'dashboard/groups_head'
-
else
-
else
...
...
app/views/explore/projects/index.html.haml
浏览文件 @
60011bc4
...
@@ -2,8 +2,6 @@
...
@@ -2,8 +2,6 @@
-
page_title
_
(
"Projects"
)
-
page_title
_
(
"Projects"
)
-
header_title
_
(
"Projects"
),
dashboard_projects_path
-
header_title
_
(
"Projects"
),
dashboard_projects_path
=
render_if_exists
"shared/gold_trial_callout"
-
if
current_user
-
if
current_user
=
render
'dashboard/projects_head'
=
render
'dashboard/projects_head'
-
else
-
else
...
...
app/views/explore/projects/starred.html.haml
浏览文件 @
60011bc4
...
@@ -2,8 +2,6 @@
...
@@ -2,8 +2,6 @@
-
page_title
_
(
"Projects"
)
-
page_title
_
(
"Projects"
)
-
header_title
_
(
"Projects"
),
dashboard_projects_path
-
header_title
_
(
"Projects"
),
dashboard_projects_path
=
render_if_exists
"shared/gold_trial_callout"
-
if
current_user
-
if
current_user
=
render
'dashboard/projects_head'
=
render
'dashboard/projects_head'
-
else
-
else
...
...
app/views/explore/projects/trending.html.haml
浏览文件 @
60011bc4
...
@@ -2,8 +2,6 @@
...
@@ -2,8 +2,6 @@
-
page_title
_
(
"Projects"
)
-
page_title
_
(
"Projects"
)
-
header_title
_
(
"Projects"
),
dashboard_projects_path
-
header_title
_
(
"Projects"
),
dashboard_projects_path
=
render_if_exists
"shared/gold_trial_callout"
-
if
current_user
-
if
current_user
=
render
'dashboard/projects_head'
=
render
'dashboard/projects_head'
-
else
-
else
...
...
spec/features/dashboard/merge_requests_spec.rb
浏览文件 @
60011bc4
...
@@ -6,7 +6,6 @@ describe 'Dashboard Merge Requests' do
...
@@ -6,7 +6,6 @@ describe 'Dashboard Merge Requests' do
include
ProjectForksHelper
include
ProjectForksHelper
let
(
:current_user
)
{
create
:user
}
let
(
:current_user
)
{
create
:user
}
let
(
:user
)
{
current_user
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:public_project
)
{
create
(
:project
,
:public
,
:repository
)
}
let
(
:public_project
)
{
create
(
:project
,
:public
,
:repository
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录