kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix typos

This commit is contained in:
Katrin Leinweber 2019-01-21 18:06:16 +00:00
parent fe4f8cad21
commit 10b76acd5c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/development/automatic_ce_ee_merge.md
View File

@ -148,7 +148,7 @@ merge commit SHA is `138f5e2f20289bb376caffa0303adb0cac859ce1`:
- To cherry-pick multiple commits, such as B and D in a range [A > B > C > D], use: - To cherry-pick multiple commits, such as B and D in a range [A > B > C > D], use:
```shell ```shell
git cherry-pick commmit-B-SHA commit-D-SHA git cherry-pick commit-B-SHA commit-D-SHA
``` ```
For example, suppose commit B SHA = `4f5e4018c09ed797fdf446b3752f82e46f5af502`, For example, suppose commit B SHA = `4f5e4018c09ed797fdf446b3752f82e46f5af502`,
@ -213,7 +213,7 @@ being able to deploy.
No, not if there is an EE merge request for every CE merge request that causes No, not if there is an EE merge request for every CE merge request that causes
conflicts _and_ that EE merge request is merged first. In the past we may have conflicts _and_ that EE merge request is merged first. In the past we may have
been a bit more relaxed when it comes to enforcing EE merge requests, but to been a bit more relaxed when it comes to enforcing EE merge requests, but to
enable automatic merging have to start requiring such merge requests even for enable automatic merging we have to start requiring such merge requests even for
the smallest conflicts. the smallest conflicts.
### Some files I work with often conflict, how can I best deal with this? ### Some files I work with often conflict, how can I best deal with this?

4
spec/requests/api/submodules_spec.rb
View File

@ -64,7 +64,7 @@ describe API::Submodules do
expect(response).to have_gitlab_http_status(400) expect(response).to have_gitlab_http_status(400)
end end
it 'returns the commmit' do it 'returns the commit' do
head_commit = project.repository.commit.id head_commit = project.repository.commit.id
put api(route(submodule), user), params: params put api(route(submodule), user), params: params
@ -81,7 +81,7 @@ describe API::Submodules do
let(:branch) { 'submodule_inside_folder' } let(:branch) { 'submodule_inside_folder' }
let(:encoded_submodule) { CGI.escape(submodule) } let(:encoded_submodule) { CGI.escape(submodule) }
it 'returns the commmit' do it 'returns the commit' do
expect(Submodules::UpdateService) expect(Submodules::UpdateService)
.to receive(:new) .to receive(:new)
.with(any_args, hash_including(submodule: submodule)) .with(any_args, hash_including(submodule: submodule))