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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
139c513d
Commit
139c513d
authored
Feb 18, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rubocop offenses
parent
1bda6fdf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/helpers/tasks_helper.rb
app/helpers/tasks_helper.rb
+1
-1
spec/services/merge_requests/close_service_spec.rb
spec/services/merge_requests/close_service_spec.rb
+3
-3
No files found.
app/helpers/tasks_helper.rb
View file @
139c513d
...
@@ -31,7 +31,7 @@ module TasksHelper
...
@@ -31,7 +31,7 @@ module TasksHelper
def
task_note_target_path
(
task
)
def
task_note_target_path
(
task
)
polymorphic_path
([
task
.
project
.
namespace
.
becomes
(
Namespace
),
polymorphic_path
([
task
.
project
.
namespace
.
becomes
(
Namespace
),
task
.
project
,
task
.
target
],
anchor:
dom_id
(
task
.
note
))
task
.
project
,
task
.
target
],
anchor:
dom_id
(
task
.
note
))
end
end
def
task_note
(
text
,
options
=
{})
def
task_note
(
text
,
options
=
{})
...
...
spec/services/merge_requests/close_service_spec.rb
View file @
139c513d
...
@@ -43,9 +43,9 @@ describe MergeRequests::CloseService, services: true do
...
@@ -43,9 +43,9 @@ describe MergeRequests::CloseService, services: true do
expect
(
note
.
note
).
to
include
'Status changed to closed'
expect
(
note
.
note
).
to
include
'Status changed to closed'
end
end
it
'marks pending tasks as done'
do
it
'marks pending tasks as done'
do
expect
(
pending_task
.
reload
).
to
be_done
expect
(
pending_task
.
reload
).
to
be_done
end
end
end
end
end
end
end
end
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