Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
10b76acd
Commit
10b76acd
authored
Jan 21, 2019
by
Katrin Leinweber
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix typos
parent
fe4f8cad
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
doc/development/automatic_ce_ee_merge.md
doc/development/automatic_ce_ee_merge.md
+2
-2
spec/requests/api/submodules_spec.rb
spec/requests/api/submodules_spec.rb
+2
-2
No files found.
doc/development/automatic_ce_ee_merge.md
View file @
10b76acd
...
@@ -148,7 +148,7 @@ merge commit SHA is `138f5e2f20289bb376caffa0303adb0cac859ce1`:
...
@@ -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 comm
m
it-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.
...
@@ -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?
...
...
spec/requests/api/submodules_spec.rb
View file @
10b76acd
...
@@ -64,7 +64,7 @@ describe API::Submodules do
...
@@ -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 comm
m
it'
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
...
@@ -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 comm
m
it'
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
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment