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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
501f0488
Commit
501f0488
authored
Dec 20, 2012
by
Riyad Preukschas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename gitlab:app:enable_automerge to gitlab:enable_automerge
parent
e3a7e43f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
14 deletions
+12
-14
doc/raketasks/features.md
doc/raketasks/features.md
+1
-1
lib/tasks/gitlab/check.rake
lib/tasks/gitlab/check.rake
+1
-1
lib/tasks/gitlab/enable_automerge.rake
lib/tasks/gitlab/enable_automerge.rake
+9
-11
lib/tasks/gitlab/setup.rake
lib/tasks/gitlab/setup.rake
+1
-1
No files found.
doc/raketasks/features.md
View file @
501f0488
...
...
@@ -22,7 +22,7 @@ bundle exec rake gitlab:enable_namespaces
This command will enable the auto merge feature. After this you will be able to
**merge a merge request**
via GitLab and use the
**online editor**
.
```
bundle exec rake gitlab:
app:
enable_automerge
bundle exec rake gitlab:enable_automerge
```
Example output:
...
...
lib/tasks/gitlab/check.rake
View file @
501f0488
...
...
@@ -192,7 +192,7 @@ namespace :gitlab do
else
puts
"no"
.
red
try_fixing_it
(
"sudo -u gitlab -H bundle exec rake gitlab:
app:
enable_automerge"
"sudo -u gitlab -H bundle exec rake gitlab:enable_automerge"
)
for_more_information
(
"doc/raketasks/maintenance.md "
...
...
lib/tasks/gitlab/enable_automerge.rake
View file @
501f0488
namespace
:gitlab
do
namespace
:app
do
desc
"GITLAB | Enable auto merge"
task
:enable_automerge
=>
:environment
do
Gitlab
::
Gitolite
.
new
.
enable_automerge
...
...
@@ -13,5 +12,4 @@ namespace :gitlab do
puts
"Done!"
.
green
end
end
end
lib/tasks/gitlab/setup.rake
View file @
501f0488
...
...
@@ -4,7 +4,7 @@ namespace :gitlab do
task
:setup
=>
[
'db:setup'
,
'db:seed_fu'
,
'gitlab:
app:
enable_automerge'
'gitlab:enable_automerge'
]
end
end
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