Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6c7fe153
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,体验更适合开发者的 AI 搜索 >>
提交
6c7fe153
编写于
7月 22, 2020
作者:
G
GitLab Bot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add latest changes from gitlab-org/gitlab@master
上级
448ff1fb
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
41 addition
and
39 deletion
+41
-39
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+4
-0
app/views/dashboard/_activities.html.haml
app/views/dashboard/_activities.html.haml
+2
-2
app/views/groups/_activities.html.haml
app/views/groups/_activities.html.haml
+2
-2
app/views/help/ui.html.haml
app/views/help/ui.html.haml
+2
-2
app/views/projects/_activity.html.haml
app/views/projects/_activity.html.haml
+2
-2
app/views/projects/commits/show.html.haml
app/views/projects/commits/show.html.haml
+2
-2
app/views/projects/tags/index.html.haml
app/views/projects/tags/index.html.haml
+2
-2
app/views/shared/issuable/_feed_buttons.html.haml
app/views/shared/issuable/_feed_buttons.html.haml
+2
-2
app/views/users/show.html.haml
app/views/users/show.html.haml
+2
-2
changelogs/unreleased/225947-replace-fa-rss.yml
changelogs/unreleased/225947-replace-fa-rss.yml
+5
-0
doc/administration/gitaly/praefect.md
doc/administration/gitaly/praefect.md
+3
-3
qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb
...a/specs/features/browser_ui/2_plan/issue/mentions_spec.rb
+9
-8
spec/features/issues/user_filters_issues_spec.rb
spec/features/issues/user_filters_issues_spec.rb
+1
-3
spec/features/issues/user_sees_empty_state_spec.rb
spec/features/issues/user_sees_empty_state_spec.rb
+1
-5
spec/support/shared_examples/features/rss_shared_examples.rb
spec/support/shared_examples/features/rss_shared_examples.rb
+2
-4
未找到文件。
app/assets/stylesheets/framework/buttons.scss
浏览文件 @
6c7fe153
...
...
@@ -495,6 +495,10 @@
}
}
// The .btn-svg class is available for legacy icon buttons to
// preserve a 34px height and have 16x16 icons at the same time.
// Once a button is migrated (to the current 32px height)
// please remove this class from the new button.
.btn-svg
svg
{
@include
btn-svg
;
}
...
...
app/views/dashboard/_activities.html.haml
浏览文件 @
6c7fe153
.nav-block.activities
=
render
'shared/event_filter'
.controls
=
link_to
dashboard_projects_path
(
rss_url_options
),
class:
'btn
d-none d-sm-inline-block
has-tooltip'
,
title:
'Subscribe'
do
%i
.fa.fa-rss
=
link_to
dashboard_projects_path
(
rss_url_options
),
class:
'btn
gl-button btn-default btn-icon d-none d-sm-inline-flex
has-tooltip'
,
title:
'Subscribe'
do
=
sprite_icon
(
'rss'
,
css_class:
'qa-rss-icon gl-icon'
,
size:
16
)
.content_list
.loading
...
...
app/views/groups/_activities.html.haml
浏览文件 @
6c7fe153
.nav-block.activities
=
render
'shared/event_filter'
,
show_group_events:
@group
.
supports_events?
.controls
=
link_to
group_path
(
@group
,
rss_url_options
),
class:
'btn
d-none d-sm-inline-block
has-tooltip'
,
title:
'Subscribe'
do
%i
.fa.fa-rss
=
link_to
group_path
(
@group
,
rss_url_options
),
class:
'btn
gl-button btn-default btn-icon d-none d-sm-inline-flex
has-tooltip'
,
title:
'Subscribe'
do
=
sprite_icon
(
'rss'
,
css_class:
'qa-rss-icon gl-icon'
,
size:
16
)
.content_list
.loading
...
...
app/views/help/ui.html.haml
浏览文件 @
6c7fe153
...
...
@@ -69,8 +69,8 @@
=
render
layout:
'users/cover_controls'
do
=
link_to
'#'
,
class:
link_classes
+
'btn btn-default'
do
=
sprite_icon
(
'pencil'
)
=
link_to
'#'
,
class:
link_classes
+
'btn btn-default'
do
=
icon
(
'rss'
)
=
link_to
'#'
,
class:
link_classes
+
'btn btn-
svg btn-
default'
do
=
sprite_icon
(
'rss'
,
css_class:
'qa-rss-icon'
,
size:
16
)
.avatar-holder
=
image_tag
avatar_icon_for_email
(
'admin@example.com'
,
90
),
class:
"avatar s90"
,
alt:
''
.cover-title
...
...
app/views/projects/_activity.html.haml
浏览文件 @
6c7fe153
...
...
@@ -4,8 +4,8 @@
.nav-block.d-none.d-sm-flex.activities.gl-static
=
render
'shared/event_filter'
.controls.gl-display-flex
=
link_to
project_path
(
@project
,
rss_url_options
),
title:
s_
(
"ProjectActivityRSS|Subscribe"
),
class:
'btn
d-none d-sm-inline-block
has-tooltip'
do
=
icon
(
'rss'
)
=
link_to
project_path
(
@project
,
rss_url_options
),
title:
s_
(
"ProjectActivityRSS|Subscribe"
),
class:
'btn
gl-button btn-default btn-icon d-none d-sm-inline-flex
has-tooltip'
do
=
sprite_icon
(
'rss'
,
css_class:
'qa-rss-icon gl-icon'
,
size:
16
)
-
if
is_project_overview
&&
can?
(
current_user
,
:download_code
,
@project
)
.project-clone-holder.d-none.d-md-inline-flex.gl-ml-2
=
render
"projects/buttons/clone"
,
dropdown_class:
'dropdown-menu-right'
...
...
app/views/projects/commits/show.html.haml
浏览文件 @
6c7fe153
...
...
@@ -26,8 +26,8 @@
=
form_tag
(
project_commits_path
(
@project
,
@id
),
method: :get
,
class:
'commits-search-form js-signature-container'
,
data:
{
'signatures-path'
=>
namespace_project_signatures_path
})
do
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
_
(
'Search by message'
),
id:
'commits-search'
,
class:
'form-control search-text-input input-short gl-mt-3 gl-sm-mt-0 gl-min-w-full'
,
spellcheck:
false
}
.control.d-none.d-md-block
=
link_to
project_commits_path
(
@project
,
@ref
,
rss_url_options
),
title:
_
(
"Commits feed"
),
class:
'btn'
do
=
icon
(
"rss"
)
=
link_to
project_commits_path
(
@project
,
@ref
,
rss_url_options
),
title:
_
(
"Commits feed"
),
class:
'btn
btn-svg
'
do
=
sprite_icon
(
'rss'
,
css_class:
'qa-rss-icon'
,
size:
16
)
=
render_if_exists
'projects/commits/mirror_status'
...
...
app/views/projects/tags/index.html.haml
浏览文件 @
6c7fe153
...
...
@@ -26,8 +26,8 @@
-
if
can?
(
current_user
,
:admin_tag
,
@project
)
=
link_to
new_project_tag_path
(
@project
),
class:
'btn btn-success new-tag-btn'
,
data:
{
qa_selector:
"new_tag_button"
}
do
=
s_
(
'TagsPage|New tag'
)
=
link_to
project_tags_path
(
@project
,
rss_url_options
),
title:
_
(
"Tags feed"
),
class:
'btn d-none d-sm-inline-block has-tooltip'
do
=
icon
(
"rss"
)
=
link_to
project_tags_path
(
@project
,
rss_url_options
),
title:
_
(
"Tags feed"
),
class:
'btn
btn-svg
d-none d-sm-inline-block has-tooltip'
do
=
sprite_icon
(
'rss'
,
css_class:
'qa-rss-icon'
,
size:
16
)
=
render_if_exists
'projects/commits/mirror_status'
...
...
app/views/shared/issuable/_feed_buttons.html.haml
浏览文件 @
6c7fe153
=
link_to
safe_params
.
merge
(
rss_url_options
),
class:
'btn
has-tooltip js-rss-button
'
,
data:
{
container:
'body'
},
title:
_
(
'Subscribe to RSS feed'
)
do
=
sprite_icon
(
'rss'
)
=
link_to
safe_params
.
merge
(
rss_url_options
),
class:
'btn
btn-svg has-tooltip
'
,
data:
{
container:
'body'
},
title:
_
(
'Subscribe to RSS feed'
)
do
=
sprite_icon
(
'rss'
,
css_class:
'qa-rss-icon'
,
size:
16
)
=
link_to
safe_params
.
merge
(
calendar_url_options
),
class:
'btn has-tooltip'
,
data:
{
container:
'body'
},
title:
_
(
'Subscribe to calendar'
)
do
=
sprite_icon
(
'calendar'
)
app/views/users/show.html.haml
浏览文件 @
6c7fe153
...
...
@@ -25,8 +25,8 @@
title:
s_
(
'UserProfile|Report abuse'
),
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
icon
(
'exclamation-circle'
)
-
if
can?
(
current_user
,
:read_user_profile
,
@user
)
=
link_to
user_path
(
@user
,
rss_url_options
),
class:
link_classes
+
'btn btn-default has-tooltip'
,
title:
s_
(
'UserProfile|Subscribe'
),
'aria-label'
:
'Subscribe'
do
=
icon
(
'rss'
)
=
link_to
user_path
(
@user
,
rss_url_options
),
class:
link_classes
+
'btn btn-
svg btn-
default has-tooltip'
,
title:
s_
(
'UserProfile|Subscribe'
),
'aria-label'
:
'Subscribe'
do
=
sprite_icon
(
'rss'
,
css_class:
'qa-rss-icon'
,
size:
16
)
-
if
current_user
&&
current_user
.
admin?
=
link_to
[
:admin
,
@user
],
class:
link_classes
+
'btn btn-default'
,
title:
s_
(
'UserProfile|View user in admin area'
),
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
...
...
changelogs/unreleased/225947-replace-fa-rss.yml
0 → 100644
浏览文件 @
6c7fe153
---
title
:
Replace fa-rss with GitLab SVG icon
merge_request
:
36553
author
:
type
:
other
doc/administration/gitaly/praefect.md
浏览文件 @
6c7fe153
...
...
@@ -1031,11 +1031,11 @@ also be logged with an accompanying replication job ID.
If your GitLab instance already has repositories, these won't be migrated
automatically.
Repositories may be moved from one storage location using the
[
Repository
API
](
../../api/projects.html#edit-project
)
:
Repositories may be moved from one storage location using the
[
Project repository storage moves API
](
../../api/project_repository_storage_moves.md
)
:
```
shell
curl
--request
PUT
--header
"PRIVATE-TOKEN: <your_access_token>"
--data
"repository_storage=praefect"
https://example.gitlab.com/api/v4/projects/123
curl
--request
POST
--header
"PRIVATE_TOKEN: <your_access_token>"
--header
"Content-Type: application/json"
\
--data
'{"destination_storage_name":"praefect"}'
"https://gitlab.example.com/api/v4/projects/123/repository_storage_moves"
```
## Debugging Praefect
...
...
qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb
浏览文件 @
6c7fe153
...
...
@@ -3,17 +3,18 @@
module
QA
RSpec
.
describe
'Plan'
,
:smoke
,
:reliable
do
describe
'mention'
do
before
do
Flow
::
Login
.
sign_in
@user
=
Resource
::
User
.
fabricate_or_use
(
Runtime
::
Env
.
gitlab_qa_username_1
,
Runtime
::
Env
.
gitlab_qa_password_1
)
project
=
Resource
::
Project
.
fabricate_via_api!
do
|
project
|
let
(
:user
)
{
Resource
::
User
.
fabricate_or_use
(
Runtime
::
Env
.
gitlab_qa_username_1
,
Runtime
::
Env
.
gitlab_qa_password_1
)
}
let
(
:project
)
do
Resource
::
Project
.
fabricate_via_api!
do
|
project
|
project
.
name
=
'project-to-test-mention'
project
.
visibility
=
'private'
end
end
before
do
Flow
::
Login
.
sign_in
project
.
add_member
(
@
user
)
project
.
add_member
(
user
)
Resource
::
Issue
.
fabricate_via_api!
do
|
issue
|
issue
.
project
=
project
...
...
@@ -22,7 +23,7 @@ module QA
it
'mentions another user in an issue'
do
Page
::
Project
::
Issue
::
Show
.
perform
do
|
show
|
at_username
=
"@
#{
@
user
.
username
}
"
at_username
=
"@
#{
user
.
username
}
"
show
.
select_all_activities_filter
show
.
comment
(
at_username
)
...
...
spec/features/issues/user_filters_issues_spec.rb
浏览文件 @
6c7fe153
...
...
@@ -2,13 +2,11 @@
require
'spec_helper'
RSpec
.
describe
'User filters issues'
do
RSpec
.
describe
'User filters issues'
,
:js
do
let_it_be
(
:user
)
{
create
(
:user
)
}
let_it_be
(
:project
)
{
create
(
:project_empty_repo
,
:public
)
}
before
do
stub_feature_flags
(
vue_issuables_list:
false
)
%w[foobar barbaz]
.
each
do
|
title
|
create
(
:issue
,
author:
user
,
...
...
spec/features/issues/user_sees_empty_state_spec.rb
浏览文件 @
6c7fe153
...
...
@@ -2,14 +2,10 @@
require
'spec_helper'
RSpec
.
describe
'Issues > User sees empty state'
do
RSpec
.
describe
'Issues > User sees empty state'
,
:js
do
let_it_be
(
:project
)
{
create
(
:project
,
:public
)
}
let_it_be
(
:user
)
{
project
.
creator
}
before
do
stub_feature_flags
(
vue_issuables_list:
false
)
end
shared_examples_for
'empty state with filters'
do
it
'user sees empty state with filters'
do
create
(
:issue
,
author:
user
,
project:
project
)
...
...
spec/support/shared_examples/features/rss_shared_examples.rb
浏览文件 @
6c7fe153
...
...
@@ -9,8 +9,7 @@ end
RSpec
.
shared_examples
"it has an RSS button with current_user's feed token"
do
it
"shows the RSS button with current_user's feed token"
do
expect
(
page
)
.
to
have_css
(
"a:has(.fa-rss)[href*='feed_token=
#{
user
.
feed_token
}
']"
)
.
or
have_css
(
"a.js-rss-button[href*='feed_token=
#{
user
.
feed_token
}
']"
)
.
to
have_css
(
"a:has(.qa-rss-icon)[href*='feed_token=
#{
user
.
feed_token
}
']"
)
end
end
...
...
@@ -23,7 +22,6 @@ end
RSpec
.
shared_examples
"it has an RSS button without a feed token"
do
it
"shows the RSS button without a feed token"
do
expect
(
page
)
.
to
have_css
(
"a:has(.fa-rss):not([href*='feed_token'])"
)
.
or
have_css
(
"a.js-rss-button:not([href*='feed_token'])"
)
.
to
have_css
(
"a:has(.qa-rss-icon):not([href*='feed_token'])"
)
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录