Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
02cfff46
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,发现更多精彩内容 >>
提交
02cfff46
编写于
4月 12, 2016
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Removed references to subscribe-button CSS class
These were being blocked by adblocks Closes #15043
上级
4087bd16
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
10 addition
and
16 deletion
+10
-16
app/assets/javascripts/subscription.js.coffee
app/assets/javascripts/subscription.js.coffee
+1
-1
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+0
-6
app/assets/stylesheets/pages/labels.scss
app/assets/stylesheets/pages/labels.scss
+1
-1
app/views/projects/labels/_label.html.haml
app/views/projects/labels/_label.html.haml
+1
-1
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+2
-2
features/steps/project/issues/issues.rb
features/steps/project/issues/issues.rb
+2
-2
features/steps/project/labels.rb
features/steps/project/labels.rb
+1
-1
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+2
-2
未找到文件。
app/assets/javascripts/subscription.js.coffee
浏览文件 @
02cfff46
...
...
@@ -2,7 +2,7 @@ class @Subscription
constructor
:
(
container
)
->
$container
=
$
(
container
)
@
url
=
$container
.
attr
(
'data-url'
)
@
subscribe_button
=
$container
.
find
(
'.subscribe-button'
)
@
subscribe_button
=
$container
.
find
(
'.
issuable-
subscribe-button'
)
@
subscription_status
=
$container
.
find
(
'.subscription-status'
)
@
subscribe_button
.
unbind
(
'click'
).
click
(
@
toggleSubscription
)
...
...
app/assets/stylesheets/pages/issuable.scss
浏览文件 @
02cfff46
...
...
@@ -173,12 +173,6 @@
}
}
.subscribe-button
{
span
{
margin-top
:
0
;
}
}
&
.right-sidebar-collapsed
{
/* Extra small devices (phones, less than 768px) */
display
:
none
;
...
...
app/assets/stylesheets/pages/labels.scss
浏览文件 @
02cfff46
...
...
@@ -106,7 +106,7 @@
padding
:
6px
;
color
:
$gl-text-color
;
&
.subscribe-button
{
&
.
label-
subscribe-button
{
padding-left
:
0
;
}
}
...
...
app/views/projects/labels/_label.html.haml
浏览文件 @
02cfff46
...
...
@@ -14,7 +14,7 @@
.label-subscription
{
data:
{
url:
toggle_subscription_namespace_project_label_path
(
@project
.
namespace
,
@project
,
label
)}}
.subscription-status
{
data:
{
status:
label_subscription_status
(
label
)}}
%a
.subscribe-button.btn.action-buttons
{
data:
{
toggle:
"tooltip"
}}
%a
.
label-
subscribe-button.btn.action-buttons
{
data:
{
toggle:
"tooltip"
}}
%span
=
label_subscription_toggle_button_text
(
label
)
-
if
can?
current_user
,
:admin_label
,
@project
...
...
app/views/shared/issuable/_sidebar.html.haml
浏览文件 @
02cfff46
...
...
@@ -128,7 +128,7 @@
.title.hide-collapsed
Notifications
-
subscribtion_status
=
subscribed
?
'subscribed'
:
'unsubscribed'
%button
.btn.btn-block.btn-gray.subscribe-button.hide-collapsed
{
:type
=>
'button'
}
%button
.btn.btn-block.btn-gray.
issuable-
subscribe-button.hide-collapsed
{
:type
=>
'button'
}
%span
=
subscribed
?
'Unsubscribe'
:
'Subscribe'
.subscription-status.hide-collapsed
{
data:
{
status:
subscribtion_status
}}
.unsubscribed
{
class:
(
'hidden'
if
subscribed
)}
...
...
@@ -152,4 +152,4 @@
new
LabelsSelect
();
new
IssuableContext
(
'
#{
current_user
.
to_json
(
only:
[
:username
,
:id
,
:name
])
}
'
);
new
Subscription
(
'
.subscription
'
)
new
Sidebar
();
\ No newline at end of file
new
Sidebar
();
features/steps/project/issues/issues.rb
浏览文件 @
02cfff46
...
...
@@ -20,11 +20,11 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
end
step
'I should see that I am subscribed'
do
expect
(
find
(
'.subscribe-button span'
)).
to
have_content
'Unsubscribe'
expect
(
find
(
'.
issuable-
subscribe-button span'
)).
to
have_content
'Unsubscribe'
end
step
'I should see that I am unsubscribed'
do
expect
(
find
(
'.subscribe-button span'
)).
to
have_content
'Subscribe'
expect
(
find
(
'.
issuable-
subscribe-button span'
)).
to
have_content
'Subscribe'
end
step
'I click link "Closed"'
do
...
...
features/steps/project/labels.rb
浏览文件 @
02cfff46
...
...
@@ -29,6 +29,6 @@ class Spinach::Features::Labels < Spinach::FeatureSteps
private
def
subscribe_button
first
(
'.subscribe-button span'
)
first
(
'.
label-
subscribe-button span'
)
end
end
features/steps/project/merge_requests.rb
浏览文件 @
02cfff46
...
...
@@ -77,11 +77,11 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
step
'I should see that I am subscribed'
do
expect
(
find
(
'.subscribe-button span'
)).
to
have_content
'Unsubscribe'
expect
(
find
(
'.
issuable-
subscribe-button span'
)).
to
have_content
'Unsubscribe'
end
step
'I should see that I am unsubscribed'
do
expect
(
find
(
'.subscribe-button span'
)).
to
have_content
'Subscribe'
expect
(
find
(
'.
issuable-
subscribe-button span'
)).
to
have_content
'Subscribe'
end
step
'I click button "Unsubscribe"'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录