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
aa6426f4
Commit
aa6426f4
authored
Apr 11, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Satellite will exist when doing automerge_check.
parent
415c0f4b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
8 deletions
+0
-8
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+0
-2
lib/gitlab/satellite/satellite.rb
lib/gitlab/satellite/satellite.rb
+0
-6
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
aa6426f4
...
...
@@ -108,8 +108,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@merge_request
.
check_if_can_be_merged
end
render
json:
{
merge_status:
@merge_request
.
merge_status_name
}
rescue
Gitlab
::
SatelliteNotExistError
render
json:
{
merge_status: :no_satellite
}
end
def
automerge
...
...
lib/gitlab/satellite/satellite.rb
View file @
aa6426f4
module
Gitlab
class
SatelliteNotExistError
<
StandardError
def
initialize
(
msg
=
"Satellite doesn't exist"
)
super
end
end
module
Satellite
class
Satellite
include
Gitlab
::
Popen
...
...
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