diff options
| author | Markus Koller <mkoller@gitlab.com> | 2019-06-13 12:44:41 +0200 |
|---|---|---|
| committer | Markus Koller <mkoller@gitlab.com> | 2019-07-18 09:19:18 +0200 |
| commit | f8cecafb07792bcaf9d7ffa85766c3b33c1dd252 (patch) | |
| tree | abafa6e9dbbb602f61b83abff508acbae074ceee /spec/spec_helper.rb | |
| parent | b921b2d1fb0c1cb3e6d4f3c88806855b48827855 (diff) | |
| download | gitlab-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/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 95e0d8858b9..fb9e3b295f8 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -104,6 +104,7 @@ RSpec.configure do |config| config.include Rails.application.routes.url_helpers, type: :routing config.include PolicyHelpers, type: :policy config.include MemoryUsageHelper + config.include ExpectRequestWithStatus, type: :request if ENV['CI'] # This includes the first try, i.e. tests will be run 4 times before failing. |