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
5ed1847e
Commit
5ed1847e
authored
Nov 16, 2016
by
Ruben Davila
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken specs.
parent
80e314be
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
9 deletions
+9
-9
app/controllers/projects/notes_controller.rb
app/controllers/projects/notes_controller.rb
+2
-2
app/serializers/issuable_entity.rb
app/serializers/issuable_entity.rb
+0
-1
app/serializers/issue_serializer.rb
app/serializers/issue_serializer.rb
+3
-3
app/serializers/merge_request_serializer.rb
app/serializers/merge_request_serializer.rb
+3
-3
spec/lib/gitlab/import_export/all_models.yml
spec/lib/gitlab/import_export/all_models.yml
+1
-0
No files found.
app/controllers/projects/notes_controller.rb
View file @
5ed1847e
...
...
@@ -148,8 +148,7 @@ class Projects::NotesController < Projects::ApplicationController
def
note_json
(
note
)
attrs
=
{
award:
false
,
id:
note
.
id
,
commands_changes:
note
.
commands_changes
id:
note
.
id
}
if
note
.
is_a?
(
AwardEmoji
)
...
...
@@ -198,6 +197,7 @@ class Projects::NotesController < Projects::ApplicationController
)
end
attrs
[
:commands_changes
]
=
note
.
commands_changes
unless
attrs
[
:award
]
attrs
end
...
...
app/serializers/issuable_entity.rb
View file @
5ed1847e
...
...
@@ -18,4 +18,3 @@ class IssuableEntity < Grape::Entity
expose
:human_time_estimate
expose
:human_total_time_spent
end
app/serializers/issue_serializer.rb
View file @
5ed1847e
class
IssueSerializer
<
BaseSerializer
entity
IssueEntity
end
class
IssueSerializer
<
BaseSerializer
entity
IssueEntity
end
app/serializers/merge_request_serializer.rb
View file @
5ed1847e
class
MergeRequestSerializer
<
BaseSerializer
entity
MergeRequestEntity
end
class
MergeRequestSerializer
<
BaseSerializer
entity
MergeRequestEntity
end
spec/lib/gitlab/import_export/all_models.yml
View file @
5ed1847e
...
...
@@ -211,3 +211,4 @@ priorities:
-
label
timelogs
:
-
trackable
-
user
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