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
02cfff46
Commit
02cfff46
authored
Apr 12, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed references to subscribe-button CSS class
These were being blocked by adblocks Closes #15043
parent
4087bd16
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
10 additions
and
16 deletions
+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
No files found.
app/assets/javascripts/subscription.js.coffee
View file @
02cfff46
...
@@ -2,7 +2,7 @@ class @Subscription
...
@@ -2,7 +2,7 @@ class @Subscription
constructor
:
(
container
)
->
constructor
:
(
container
)
->
$container
=
$
(
container
)
$container
=
$
(
container
)
@
url
=
$container
.
attr
(
'data-url'
)
@
url
=
$container
.
attr
(
'data-url'
)
@
subscribe_button
=
$container
.
find
(
'.subscribe-button'
)
@
subscribe_button
=
$container
.
find
(
'.
issuable-
subscribe-button'
)
@
subscription_status
=
$container
.
find
(
'.subscription-status'
)
@
subscription_status
=
$container
.
find
(
'.subscription-status'
)
@
subscribe_button
.
unbind
(
'click'
).
click
(
@
toggleSubscription
)
@
subscribe_button
.
unbind
(
'click'
).
click
(
@
toggleSubscription
)
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
02cfff46
...
@@ -173,12 +173,6 @@
...
@@ -173,12 +173,6 @@
}
}
}
}
.subscribe-button
{
span
{
margin-top
:
0
;
}
}
&
.right-sidebar-collapsed
{
&
.right-sidebar-collapsed
{
/* Extra small devices (phones, less than 768px) */
/* Extra small devices (phones, less than 768px) */
display
:
none
;
display
:
none
;
...
...
app/assets/stylesheets/pages/labels.scss
View file @
02cfff46
...
@@ -106,7 +106,7 @@
...
@@ -106,7 +106,7 @@
padding
:
6px
;
padding
:
6px
;
color
:
$gl-text-color
;
color
:
$gl-text-color
;
&
.subscribe-button
{
&
.
label-
subscribe-button
{
padding-left
:
0
;
padding-left
:
0
;
}
}
}
}
...
...
app/views/projects/labels/_label.html.haml
View file @
02cfff46
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
.label-subscription
{
data:
{
url:
toggle_subscription_namespace_project_label_path
(
@project
.
namespace
,
@project
,
label
)}}
.label-subscription
{
data:
{
url:
toggle_subscription_namespace_project_label_path
(
@project
.
namespace
,
@project
,
label
)}}
.subscription-status
{
data:
{
status:
label_subscription_status
(
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
)
%span
=
label_subscription_toggle_button_text
(
label
)
-
if
can?
current_user
,
:admin_label
,
@project
-
if
can?
current_user
,
:admin_label
,
@project
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
02cfff46
...
@@ -128,7 +128,7 @@
...
@@ -128,7 +128,7 @@
.title.hide-collapsed
.title.hide-collapsed
Notifications
Notifications
-
subscribtion_status
=
subscribed
?
'subscribed'
:
'unsubscribed'
-
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'
%span
=
subscribed
?
'Unsubscribe'
:
'Subscribe'
.subscription-status.hide-collapsed
{
data:
{
status:
subscribtion_status
}}
.subscription-status.hide-collapsed
{
data:
{
status:
subscribtion_status
}}
.unsubscribed
{
class:
(
'hidden'
if
subscribed
)}
.unsubscribed
{
class:
(
'hidden'
if
subscribed
)}
...
@@ -152,4 +152,4 @@
...
@@ -152,4 +152,4 @@
new
LabelsSelect
();
new
LabelsSelect
();
new
IssuableContext
(
'
#{
current_user
.
to_json
(
only:
[
:username
,
:id
,
:name
])
}
'
);
new
IssuableContext
(
'
#{
current_user
.
to_json
(
only:
[
:username
,
:id
,
:name
])
}
'
);
new
Subscription
(
'
.subscription
'
)
new
Subscription
(
'
.subscription
'
)
new
Sidebar
();
new
Sidebar
();
\ No newline at end of file
features/steps/project/issues/issues.rb
View file @
02cfff46
...
@@ -20,11 +20,11 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
...
@@ -20,11 +20,11 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
end
end
step
'I should see that I am subscribed'
do
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
end
step
'I should see that I am unsubscribed'
do
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
end
step
'I click link "Closed"'
do
step
'I click link "Closed"'
do
...
...
features/steps/project/labels.rb
View file @
02cfff46
...
@@ -29,6 +29,6 @@ class Spinach::Features::Labels < Spinach::FeatureSteps
...
@@ -29,6 +29,6 @@ class Spinach::Features::Labels < Spinach::FeatureSteps
private
private
def
subscribe_button
def
subscribe_button
first
(
'.subscribe-button span'
)
first
(
'.
label-
subscribe-button span'
)
end
end
end
end
features/steps/project/merge_requests.rb
View file @
02cfff46
...
@@ -77,11 +77,11 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
...
@@ -77,11 +77,11 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
end
step
'I should see that I am subscribed'
do
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
end
step
'I should see that I am unsubscribed'
do
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
end
step
'I click button "Unsubscribe"'
do
step
'I click button "Unsubscribe"'
do
...
...
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