diff options
| author | Rubén Dávila <ruben@gitlab.com> | 2015-11-19 18:03:13 -0500 |
|---|---|---|
| committer | Rubén Dávila <ruben@gitlab.com> | 2015-11-19 18:03:13 -0500 |
| commit | 4865a1370e06341702f324401f7ddb4ea5a203f2 (patch) | |
| tree | cd205807545867a894a8ca2d963cdf9ba7ffb42d /app/services/git_push_service.rb | |
| parent | 431c8df53136ad30a900b1a5d38deac463211bbc (diff) | |
| parent | 0383f84d88d95183638d0e227f3446974eb4e387 (diff) | |
| download | gitlab-ce-todo_system_notes.tar.gz | |
Merge branch 'master' into todo_system_notestodo_system_notes
Diffstat (limited to 'app/services/git_push_service.rb')
| -rw-r--r-- | app/services/git_push_service.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb index ccb6b97858c..f11690aa3f4 100644 --- a/app/services/git_push_service.rb +++ b/app/services/git_push_service.rb @@ -58,12 +58,6 @@ class GitPushService @push_data = build_push_data(oldrev, newrev, ref) - # If CI was disabled but .gitlab-ci.yml file was pushed - # we enable CI automatically - if !project.builds_enabled? && gitlab_ci_yaml?(newrev) - project.enable_ci - end - EventCreateService.new.push(project, user, @push_data) project.execute_hooks(@push_data.dup, :push_hooks) project.execute_services(@push_data.dup, :push_hooks) @@ -134,10 +128,4 @@ class GitPushService def commit_user(commit) commit.author || user end - - def gitlab_ci_yaml?(sha) - @project.repository.blob_at(sha, '.gitlab-ci.yml') - rescue Rugged::ReferenceError - nil - end end |