summaryrefslogtreecommitdiff
path: root/spec/services
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-07-18 10:47:35 +0000
committerNick Thomas <nick@gitlab.com>2019-07-18 10:47:35 +0000
commit3069cb25451cf9aad4840551b7286fee1c5aebc8 (patch)
tree3f7daffc2fd7adfbebe14a625293e2f005785140 /spec/services
parent69c113fc8cff7c7646bf252d32b1956b255eaf37 (diff)
parentd4cc92db09a0c765556882943b7508075a0ab0e2 (diff)
downloadgitlab-ce-3069cb25451cf9aad4840551b7286fee1c5aebc8.tar.gz
Merge branch 'webide-commit-use-correct-parent' into 'master'
Use correct parent when committing in WebIDE See merge request gitlab-org/gitlab-ce!29598
Diffstat (limited to 'spec/services')
-rw-r--r--spec/services/submodules/update_service_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/submodules/update_service_spec.rb b/spec/services/submodules/update_service_spec.rb
index cf92350c1b2..47b31d4bcbf 100644
--- a/spec/services/submodules/update_service_spec.rb
+++ b/spec/services/submodules/update_service_spec.rb
@@ -142,7 +142,7 @@ describe Submodules::UpdateService do
let(:branch_name) { nil }
it_behaves_like 'returns error result' do
- let(:error_message) { 'You can only create or edit files when you are on a branch' }
+ let(:error_message) { 'Invalid parameters' }
end
end