diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-12-08 14:49:15 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-12-08 14:49:15 +0300 |
| commit | f071e3d3cab7ed2262114630377e058d45051dbd (patch) | |
| tree | fdb9f4690e72bd140423ddc8dac228592ed4a30b /app/services/merge_requests | |
| parent | 9c6563f64a3a770cccb9fcf3eb609416c2466080 (diff) | |
| parent | 50a784482e997cc039015e24b37d3f8a01a9cd3e (diff) | |
Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creating-file
* upstream/master: (116 commits)
adds impersonator variable and makes sudo usage overall more clear
Reenables /user API request to return private-token if user is admin and requested with sudo
Fix Backup::Manager#remove_old
Allow public access to some Tag API endpoints
Update outdated visible content spec descriptions
Grapify the issues API
new DevOps report, 404s, typos
Remove dashboard.scss
Update custom_hooks.md for global custom hooks and chained hook info
Move admin hooks spinach to rspec
Move admin logs spinach test to rspec
Fix 404 error when visit group label edit page
A simpler implementation of finding a merge request
Encourage bug reporters to mention if they use GitLab.com [ci skip]
Bump gitlab-shell version to 4.0.3
Remove confirmation.scss
Explain "js: true" in "deleted_source_branch_spec.rb" [ci skip]
Move award emojis to framwork
Move image styles to framework
Remove tags.scss
...
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/merge_when_pipeline_succeeds_service.rb (renamed from app/services/merge_requests/merge_when_build_succeeds_service.rb) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/merge_when_build_succeeds_service.rb b/app/services/merge_requests/merge_when_pipeline_succeeds_service.rb index dc159de0058..5616edf8b4a 100644 --- a/app/services/merge_requests/merge_when_build_succeeds_service.rb +++ b/app/services/merge_requests/merge_when_pipeline_succeeds_service.rb @@ -1,5 +1,5 @@ module MergeRequests - class MergeWhenBuildSucceedsService < MergeRequests::BaseService + class MergeWhenPipelineSucceedsService < MergeRequests::BaseService # Marks the passed `merge_request` to be merged when the build succeeds or # updates the params for the automatic merge def execute(merge_request) |