summaryrefslogtreecommitdiff
path: root/spec/services/discussions
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-08-02 16:37:40 +0100
committerPhil Hughes <me@iamphill.com>2017-08-02 16:37:40 +0100
commite4c20cd3fe330faa415493ee2fe30dc16fbaca80 (patch)
tree0be61b6cc59cf35d81b9271c7603e0d8b203a31c /spec/services/discussions
parent25d6a6c4b528159c288995de4909e6a8da431d0b (diff)
parent88958e5a9cd364ae36f3d2837982cedb9239c3bc (diff)
downloadgitlab-ce-e4c20cd3fe330faa415493ee2fe30dc16fbaca80.tar.gz
Merge branch 'master' into sidebar-fly-out-sub-navsidebar-fly-out-sub-nav
Diffstat (limited to 'spec/services/discussions')
-rw-r--r--spec/services/discussions/update_diff_position_service_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/discussions/update_diff_position_service_spec.rb b/spec/services/discussions/update_diff_position_service_spec.rb
index 177e32e13bd..c239494298b 100644
--- a/spec/services/discussions/update_diff_position_service_spec.rb
+++ b/spec/services/discussions/update_diff_position_service_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Discussions::UpdateDiffPositionService, services: true do
+describe Discussions::UpdateDiffPositionService do
let(:project) { create(:project, :repository) }
let(:current_user) { project.owner }
let(:create_commit) { project.commit("913c66a37b4a45b9769037c55c2d238bd0942d2e") }