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
Boxiang Sun
gitlab-ce
Commits
ab7b8b21
Commit
ab7b8b21
authored
Apr 07, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/rake_satellites_create' into 'master'
Fix popen bug in `rake gitlab:satellites:create`
parents
bfd44948
bcfd9386
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
CHANGELOG
CHANGELOG
+1
-0
lib/tasks/gitlab/enable_automerge.rake
lib/tasks/gitlab/enable_automerge.rake
+2
-5
No files found.
CHANGELOG
View file @
ab7b8b21
...
@@ -8,6 +8,7 @@ v 6.8.0
...
@@ -8,6 +8,7 @@ v 6.8.0
- Create branches via API (sponsored by O'Reilly Media)
- Create branches via API (sponsored by O'Reilly Media)
- Changed permission of gitlab-satellites directory not to be world accessible
- Changed permission of gitlab-satellites directory not to be world accessible
- Protected branch does not allow force push
- Protected branch does not allow force push
- Fix popen bug in `rake gitlab:satellites:create`
v 6.7.3
v 6.7.3
- Fix the merge notification email not being sent (Pierre de La Morinerie)
- Fix the merge notification email not being sent (Pierre de La Morinerie)
...
...
lib/tasks/gitlab/enable_automerge.rake
View file @
ab7b8b21
...
@@ -27,11 +27,8 @@ namespace :gitlab do
...
@@ -27,11 +27,8 @@ namespace :gitlab do
if
project
.
satellite
.
exists?
if
project
.
satellite
.
exists?
puts
"exists already"
.
green
puts
"exists already"
.
green
else
else
puts
""
print
"
\n
... "
project
.
satellite
.
create
if
project
.
satellite
.
create
print
"... "
if
$?
.
success?
puts
"created"
.
green
puts
"created"
.
green
else
else
puts
"error"
.
red
puts
"error"
.
red
...
...
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