summaryrefslogtreecommitdiff
path: root/spec/services/submodules
diff options
context:
space:
mode:
authorMarkus Koller <mkoller@gitlab.com>2019-06-13 12:44:41 +0200
committerMarkus Koller <mkoller@gitlab.com>2019-07-18 09:19:18 +0200
commitf8cecafb07792bcaf9d7ffa85766c3b33c1dd252 (patch)
treeabafa6e9dbbb602f61b83abff508acbae074ceee /spec/services/submodules
parentb921b2d1fb0c1cb3e6d4f3c88806855b48827855 (diff)
downloadgitlab-ce-f8cecafb07792bcaf9d7ffa85766c3b33c1dd252.tar.gz
Add start_sha to commits API
When passing start_branch on committing from the WebIDE, it's possible that the branch has changed since editing started, which results in the change being applied on top of the latest commit in the branch and overwriting the new changes. By passing the start_sha instead we can make sure that the change is applied on top of the commit which the user started editing from.
Diffstat (limited to 'spec/services/submodules')
-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