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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
60959df3
Commit
60959df3
authored
Nov 19, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove gitolite mention
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
8841eec4
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
lib/gitlab/satellite/files/edit_file_action.rb
lib/gitlab/satellite/files/edit_file_action.rb
+3
-3
lib/gitlab/satellite/files/new_file_action.rb
lib/gitlab/satellite/files/new_file_action.rb
+3
-3
lib/gitlab/satellite/merge_action.rb
lib/gitlab/satellite/merge_action.rb
+1
-1
lib/gitlab/satellite/satellite.rb
lib/gitlab/satellite/satellite.rb
+1
-1
No files found.
lib/gitlab/satellite/files/edit_file_action.rb
View file @
60959df3
...
@@ -8,13 +8,13 @@ module Gitlab
...
@@ -8,13 +8,13 @@ module Gitlab
#
#
# Returns false if the ref has been updated while editing the file
# Returns false if the ref has been updated while editing the file
# Returns false if committing the change fails
# Returns false if committing the change fails
# Returns false if pushing from the satellite to
Gitolite
failed or was rejected
# Returns false if pushing from the satellite to
bare repo
failed or was rejected
# Returns true otherwise
# Returns true otherwise
def
commit!
(
content
,
commit_message
)
def
commit!
(
content
,
commit_message
)
in_locked_and_timed_satellite
do
|
repo
|
in_locked_and_timed_satellite
do
|
repo
|
prepare_satellite!
(
repo
)
prepare_satellite!
(
repo
)
# create target branch in satellite at the corresponding commit from
Gitolite
# create target branch in satellite at the corresponding commit from
bare repo
repo
.
git
.
checkout
({
raise:
true
,
timeout:
true
,
b:
true
},
ref
,
"origin/
#{
ref
}
"
)
repo
.
git
.
checkout
({
raise:
true
,
timeout:
true
,
b:
true
},
ref
,
"origin/
#{
ref
}
"
)
# update the file in the satellite's working dir
# update the file in the satellite's working dir
...
@@ -26,7 +26,7 @@ module Gitlab
...
@@ -26,7 +26,7 @@ module Gitlab
repo
.
git
.
commit
(
raise:
true
,
timeout:
true
,
a:
true
,
m:
commit_message
)
repo
.
git
.
commit
(
raise:
true
,
timeout:
true
,
a:
true
,
m:
commit_message
)
# push commit back to
Gitolite
# push commit back to
bare repo
# will raise CommandFailed when push fails
# will raise CommandFailed when push fails
repo
.
git
.
push
({
raise:
true
,
timeout:
true
},
:origin
,
ref
)
repo
.
git
.
push
({
raise:
true
,
timeout:
true
},
:origin
,
ref
)
...
...
lib/gitlab/satellite/files/new_file_action.rb
View file @
60959df3
...
@@ -7,13 +7,13 @@ module Gitlab
...
@@ -7,13 +7,13 @@ module Gitlab
#
#
# Returns false if the ref has been updated while editing the file
# Returns false if the ref has been updated while editing the file
# Returns false if committing the change fails
# Returns false if committing the change fails
# Returns false if pushing from the satellite to
Gitolite
failed or was rejected
# Returns false if pushing from the satellite to
bare repo
failed or was rejected
# Returns true otherwise
# Returns true otherwise
def
commit!
(
content
,
commit_message
)
def
commit!
(
content
,
commit_message
)
in_locked_and_timed_satellite
do
|
repo
|
in_locked_and_timed_satellite
do
|
repo
|
prepare_satellite!
(
repo
)
prepare_satellite!
(
repo
)
# create target branch in satellite at the corresponding commit from
Gitolite
# create target branch in satellite at the corresponding commit from
bare repo
repo
.
git
.
checkout
({
raise:
true
,
timeout:
true
,
b:
true
},
ref
,
"origin/
#{
ref
}
"
)
repo
.
git
.
checkout
({
raise:
true
,
timeout:
true
,
b:
true
},
ref
,
"origin/
#{
ref
}
"
)
# update the file in the satellite's working dir
# update the file in the satellite's working dir
...
@@ -28,7 +28,7 @@ module Gitlab
...
@@ -28,7 +28,7 @@ module Gitlab
repo
.
git
.
commit
(
raise:
true
,
timeout:
true
,
a:
true
,
m:
commit_message
)
repo
.
git
.
commit
(
raise:
true
,
timeout:
true
,
a:
true
,
m:
commit_message
)
# push commit back to
Gitolite
# push commit back to
bare repo
# will raise CommandFailed when push fails
# will raise CommandFailed when push fails
repo
.
git
.
push
({
raise:
true
,
timeout:
true
},
:origin
,
ref
)
repo
.
git
.
push
({
raise:
true
,
timeout:
true
},
:origin
,
ref
)
...
...
lib/gitlab/satellite/merge_action.rb
View file @
60959df3
...
@@ -28,7 +28,7 @@ module Gitlab
...
@@ -28,7 +28,7 @@ module Gitlab
in_locked_and_timed_satellite
do
|
merge_repo
|
in_locked_and_timed_satellite
do
|
merge_repo
|
prepare_satellite!
(
merge_repo
)
prepare_satellite!
(
merge_repo
)
if
merge_in_satellite!
(
merge_repo
)
if
merge_in_satellite!
(
merge_repo
)
# push merge back to
Gitolite
# push merge back to
bare repo
# will raise CommandFailed when push fails
# will raise CommandFailed when push fails
merge_repo
.
git
.
push
(
default_options
,
:origin
,
merge_request
.
target_branch
)
merge_repo
.
git
.
push
(
default_options
,
:origin
,
merge_request
.
target_branch
)
# remove source branch
# remove source branch
...
...
lib/gitlab/satellite/satellite.rb
View file @
60959df3
...
@@ -123,7 +123,7 @@ module Gitlab
...
@@ -123,7 +123,7 @@ module Gitlab
remotes
.
each
{
|
name
|
repo
.
git
.
remote
(
default_options
,
'rm'
,
name
)}
remotes
.
each
{
|
name
|
repo
.
git
.
remote
(
default_options
,
'rm'
,
name
)}
end
end
# Updates the satellite from
Gitolite
# Updates the satellite from
bare repo
#
#
# Note: this will only update remote branches (i.e. origin/*)
# Note: this will only update remote branches (i.e. origin/*)
def
update_from_source!
def
update_from_source!
...
...
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