diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-06-07 12:32:16 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-06-13 16:05:38 +0200 |
commit | 25b99a5b3beecb7251fef9097c44afd1f82f9f57 (patch) | |
tree | 8f005048ec11ae7ad27e5d999b263b458c7487a8 /app | |
parent | d03e687882552cedaac2a493c9dbf4a3d98e0bac (diff) | |
download | gitlab-ce-25b99a5b3beecb7251fef9097c44afd1f82f9f57.tar.gz |
Update tests and applicationfix-external-ci-services
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/projects/application_controller.rb | 4 | ||||
-rw-r--r-- | app/services/git_push_service.rb | 5 | ||||
-rw-r--r-- | app/services/git_tag_push_service.rb | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb index cb4bd0ad5f5..603a51266da 100644 --- a/app/controllers/projects/application_controller.rb +++ b/app/controllers/projects/application_controller.rb @@ -80,10 +80,6 @@ class Projects::ApplicationController < ApplicationController cookies.permanent[:diff_view] = params.delete(:view) if params[:view].present? end - def builds_enabled - return render_404 unless @project.feature_available?(:builds, current_user) - end - def require_pages_enabled! not_found unless Gitlab.config.pages.enabled end diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb index 6b4d9685a27..fb1d4aed58b 100644 --- a/app/services/git_push_service.rb +++ b/app/services/git_push_service.rb @@ -101,9 +101,10 @@ class GitPushService < BaseService UpdateMergeRequestsWorker .perform_async(@project.id, current_user.id, params[:oldrev], params[:newrev], params[:ref]) - SystemHookPushWorker.perform_async(build_push_data.dup, :push_hooks) - Ci::CreatePipelineService.new(@project, current_user, build_push_data).execute(:push) EventCreateService.new.push(@project, current_user, build_push_data) + Ci::CreatePipelineService.new(@project, current_user, build_push_data).execute(:push) + + SystemHookPushWorker.perform_async(build_push_data.dup, :push_hooks) @project.execute_hooks(build_push_data.dup, :push_hooks) @project.execute_services(build_push_data.dup, :push_hooks) diff --git a/app/services/git_tag_push_service.rb b/app/services/git_tag_push_service.rb index 8710c3999b3..9917a39b795 100644 --- a/app/services/git_tag_push_service.rb +++ b/app/services/git_tag_push_service.rb @@ -9,9 +9,11 @@ class GitTagPushService < BaseService EventCreateService.new.push(project, current_user, @push_data) Ci::CreatePipelineService.new(project, current_user, @push_data).execute(:push) + SystemHooksService.new.execute_hooks(build_system_push_data.dup, :tag_push_hooks) project.execute_hooks(@push_data.dup, :tag_push_hooks) project.execute_services(@push_data.dup, :tag_push_hooks) + ProjectCacheWorker.perform_async(project.id, [], [:commit_count, :repository_size]) true |