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
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
beaee0a7
Commit
beaee0a7
authored
Apr 12, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed issue with failing tests
parent
02cfff46
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/javascripts/subscription.js.coffee
app/assets/javascripts/subscription.js.coffee
+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
+1
-1
No files found.
app/assets/javascripts/subscription.js.coffee
View file @
beaee0a7
...
...
@@ -2,7 +2,7 @@ class @Subscription
constructor
:
(
container
)
->
$container
=
$
(
container
)
@
url
=
$container
.
attr
(
'data-url'
)
@
subscribe_button
=
$container
.
find
(
'.
issuable
-subscribe-button'
)
@
subscribe_button
=
$container
.
find
(
'.
js
-subscribe-button'
)
@
subscription_status
=
$container
.
find
(
'.subscription-status'
)
@
subscribe_button
.
unbind
(
'click'
).
click
(
@
toggleSubscription
)
...
...
app/views/projects/labels/_label.html.haml
View file @
beaee0a7
...
...
@@ -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
.label-subscribe-button.btn.action-buttons
{
data:
{
toggle:
"tooltip"
}
}
%
button
.js-subscribe-button.label-subscribe-button.btn.action-buttons
{
type:
'button'
,
data:
{
toggle:
"tooltip"
}
}
%span
=
label_subscription_toggle_button_text
(
label
)
-
if
can?
current_user
,
:admin_label
,
@project
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
beaee0a7
...
...
@@ -128,7 +128,7 @@
.title.hide-collapsed
Notifications
-
subscribtion_status
=
subscribed
?
'subscribed'
:
'unsubscribed'
%button
.btn.btn-block.btn-gray.issuable-subscribe-button.hide-collapsed
{
:type
=>
'button'
}
%button
.btn.btn-block.btn-gray.
js-subscribe-button.
issuable-subscribe-button.hide-collapsed
{
:type
=>
'button'
}
%span
=
subscribed
?
'Unsubscribe'
:
'Subscribe'
.subscription-status.hide-collapsed
{
data:
{
status:
subscribtion_status
}}
.unsubscribed
{
class:
(
'hidden'
if
subscribed
)}
...
...
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