Skip to content
Snippets Groups Projects
Commit 866ca4e4 authored by GitLab Bot's avatar GitLab Bot
Browse files

Add latest changes from gitlab-org/gitlab@master

parent 26a50872
No related branches found
No related tags found
No related merge requests found
Showing
with 40 additions and 12 deletions
import Vue from 'vue';
import Vuex from 'vuex';
Vue.use(Vuex);
export default modules => new Vuex.Store({ modules });
import Vue from 'vue';
import Vuex from 'vuex';
import * as actions from './actions';
import mutations from './mutations';
import state from './state';
 
Vue.use(Vuex);
export default () =>
new Vuex.Store({
actions,
mutations,
state,
});
export default {
namespaced: true,
actions,
mutations,
state,
};
import Vue from 'vue';
import Vuex from 'vuex';
import state from './state';
import * as actions from './actions';
import mutations from './mutations';
 
Vue.use(Vuex);
export default () =>
new Vuex.Store({
actions,
mutations,
state: state(),
});
export default {
namespaced: true,
actions,
mutations,
state,
};
Loading
Loading
@@ -56,7 +56,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
end
 
def clear_repository_check_states
RepositoryCheck::ClearWorker.perform_async
RepositoryCheck::ClearWorker.perform_async # rubocop:disable CodeReuse/Worker
 
redirect_to(
general_admin_application_settings_path,
Loading
Loading
@@ -73,7 +73,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
 
# Specs are in spec/requests/self_monitoring_project_spec.rb
def create_self_monitoring_project
job_id = SelfMonitoringProjectCreateWorker.perform_async
job_id = SelfMonitoringProjectCreateWorker.perform_async # rubocop:disable CodeReuse/Worker
 
render status: :accepted, json: {
job_id: job_id,
Loading
Loading
@@ -92,7 +92,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
}
end
 
if SelfMonitoringProjectCreateWorker.in_progress?(job_id)
if SelfMonitoringProjectCreateWorker.in_progress?(job_id) # rubocop:disable CodeReuse/Worker
::Gitlab::PollingInterval.set_header(response, interval: 3_000)
 
return render status: :accepted, json: {
Loading
Loading
@@ -112,7 +112,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
 
# Specs are in spec/requests/self_monitoring_project_spec.rb
def delete_self_monitoring_project
job_id = SelfMonitoringProjectDeleteWorker.perform_async
job_id = SelfMonitoringProjectDeleteWorker.perform_async # rubocop:disable CodeReuse/Worker
 
render status: :accepted, json: {
job_id: job_id,
Loading
Loading
@@ -131,7 +131,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
}
end
 
if SelfMonitoringProjectDeleteWorker.in_progress?(job_id)
if SelfMonitoringProjectDeleteWorker.in_progress?(job_id) # rubocop:disable CodeReuse/Worker
::Gitlab::PollingInterval.set_header(response, interval: 3_000)
 
return render status: :accepted, json: {
Loading
Loading
Loading
Loading
@@ -55,7 +55,7 @@ class Admin::ProjectsController < Admin::ApplicationController
# rubocop: enable CodeReuse/ActiveRecord
 
def repository_check
RepositoryCheck::SingleRepositoryWorker.perform_async(@project.id)
RepositoryCheck::SingleRepositoryWorker.perform_async(@project.id) # rubocop:disable CodeReuse/Worker
 
redirect_to(
admin_project_path(@project),
Loading
Loading
Loading
Loading
@@ -19,7 +19,7 @@ class Admin::ServicesController < Admin::ApplicationController
 
def update
if service.update(service_params[:service])
PropagateServiceTemplateWorker.perform_async(service.id) if service.active?
PropagateServiceTemplateWorker.perform_async(service.id) if service.active? # rubocop:disable CodeReuse/Worker
 
redirect_to admin_application_settings_services_path,
notice: 'Application settings saved successfully'
Loading
Loading
Loading
Loading
@@ -188,7 +188,7 @@ class Projects::IssuesController < Projects::ApplicationController
 
def import_csv
if uploader = UploadService.new(project, params[:file]).execute
ImportIssuesCsvWorker.perform_async(current_user.id, project.id, uploader.upload.id)
ImportIssuesCsvWorker.perform_async(current_user.id, project.id, uploader.upload.id) # rubocop:disable CodeReuse/Worker
 
flash[:notice] = _("Your issues are being imported. Once finished, you'll get a confirmation email.")
else
Loading
Loading
Loading
Loading
@@ -47,7 +47,7 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController
end
 
def play
job_id = RunPipelineScheduleWorker.perform_async(schedule.id, current_user.id)
job_id = RunPipelineScheduleWorker.perform_async(schedule.id, current_user.id) # rubocop:disable CodeReuse/Worker
 
if job_id
pipelines_link_start = "<a href=\"#{project_pipelines_path(@project)}\">"
Loading
Loading
Loading
Loading
@@ -32,7 +32,7 @@ module Projects
end
 
def destroy
DeleteContainerRepositoryWorker.perform_async(current_user.id, image.id)
DeleteContainerRepositoryWorker.perform_async(current_user.id, image.id) # rubocop:disable CodeReuse/Worker
track_event(:delete_repository)
 
respond_to do |format|
Loading
Loading
Loading
Loading
@@ -69,7 +69,9 @@ module Projects
return
end
 
# rubocop:disable CodeReuse/Worker
CreatePipelineWorker.perform_async(project.id, current_user.id, project.default_branch, :web, ignore_skip_ci: true, save_on_errors: false)
# rubocop:enable CodeReuse/Worker
 
pipelines_link_start = '<a href="%{url}">'.html_safe % { url: project_pipelines_path(@project) }
flash[:toast] = _("A new Auto DevOps pipeline has been created, go to %{pipelines_link_start}Pipelines page%{pipelines_link_end} for details") % { pipelines_link_start: pipelines_link_start, pipelines_link_end: "</a>".html_safe }
Loading
Loading
Loading
Loading
@@ -25,7 +25,7 @@ module Projects
result = Projects::UpdateService.new(project, current_user, cleanup_params).execute
 
if result[:status] == :success
RepositoryCleanupWorker.perform_async(project.id, current_user.id)
RepositoryCleanupWorker.perform_async(project.id, current_user.id) # rubocop:disable CodeReuse/Worker
flash[:notice] = _('Repository cleanup has started. You will receive an email once the cleanup operation is complete.')
else
flash[:alert] = _('Failed to upload object map file')
Loading
Loading
Loading
Loading
@@ -80,7 +80,7 @@ module Repositories
return unless repo_type.project?
return unless project&.daily_statistics_enabled?
 
ProjectDailyStatisticsWorker.perform_async(project.id)
ProjectDailyStatisticsWorker.perform_async(project.id) # rubocop:disable CodeReuse/Worker
end
 
def access
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment