summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-10-12 16:41:36 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2015-10-12 16:41:36 +0200
commitc61dc1315077ad4e175a3c76991872c0e7b1d2ab (patch)
tree0806c812a381e376f49dc8ace1c29c850051f33c
parent5cd504ed331dd23d17709285237945fb867978a8 (diff)
downloadgitlab-ce-c61dc1315077ad4e175a3c76991872c0e7b1d2ab.tar.gz
Fix some changes
-rw-r--r--lib/api/entities.rb2
-rw-r--r--spec/models/commit_status_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index bfb242bb6fd..519072d0157 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -65,7 +65,7 @@ module API
expose :issues_enabled, :merge_requests_enabled, :wiki_enabled, :snippets_enabled, :created_at, :last_activity_at
expose :creator_id
expose :namespace
- expose :forked_from_project, using: Entities::ForkedFromProject, if: lambda { |project, options| project.forked? }
+ expose :forked_from_project, using: Entities::ForkedFromProject, if: lambda{ | project, options | project.forked? }
expose :avatar_url
expose :star_count, :forks_count
end
diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index cbefa7798de..c96a606fdaa 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -142,7 +142,7 @@ describe CommitStatus do
end
it 'return statuses with equal and nil ref set' do
- is_expected.to eq([@commit1, @commit3])
+ is_expected.to eq([@commit1])
end
end