Repair Regression caused by - !11573
some changes introduced by4daa6da540
,26b6e299e1
,17898ce021
were regressed during today's merge conflict resolution of !11573. This commit serves to reapply those changes. /cc: @rspeicher @stanhu @mikegreiling
This commit is contained in:
parent
0b434daf52
commit
65eca13f7b
|
@ -1,15 +1,17 @@
|
|||
module Milestones
|
||||
class DestroyService < Milestones::BaseService
|
||||
def execute(milestone)
|
||||
return unless milestone.is_project_milestone?
|
||||
|
||||
Milestone.transaction do
|
||||
update_params = { milestone: nil }
|
||||
|
||||
milestone.issues.each do |issue|
|
||||
Issues::UpdateService.new(project, current_user, update_params).execute(issue)
|
||||
Issues::UpdateService.new(parent, current_user, update_params).execute(issue)
|
||||
end
|
||||
|
||||
milestone.merge_requests.each do |merge_request|
|
||||
MergeRequests::UpdateService.new(project, current_user, update_params).execute(merge_request)
|
||||
MergeRequests::UpdateService.new(parent, current_user, update_params).execute(merge_request)
|
||||
end
|
||||
|
||||
event_service.destroy_milestone(milestone, current_user)
|
||||
|
|
|
@ -420,6 +420,12 @@ GitLab Shell is an SSH access and repository management software developed speci
|
|||
|
||||
**Note:** Make sure your hostname can be resolved on the machine itself by either a proper DNS record or an additional line in /etc/hosts ("127.0.0.1 hostname"). This might be necessary for example if you set up GitLab behind a reverse proxy. If the hostname cannot be resolved, the final installation check will fail with "Check GitLab API access: FAILED. code: 401" and pushing commits will be rejected with "[remote rejected] master -> master (hook declined)".
|
||||
|
||||
**Note:** GitLab Shell application startup time can be greatly reduced by disabling RubyGems. This can be done in several manners:
|
||||
|
||||
* Export `RUBYOPT=--disable-gems` environment variable for the processes
|
||||
* Compile Ruby with `configure --disable-rubygems` to disable RubyGems by default. Not recommened for system-wide Ruby.
|
||||
* Omnibus GitLab [replaces the *shebang* line of the `gitlab-shell/bin/*` scripts](https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1707)
|
||||
|
||||
### Install gitlab-workhorse
|
||||
|
||||
GitLab-Workhorse uses [GNU Make](https://www.gnu.org/software/make/). The
|
||||
|
|
|
@ -25,7 +25,7 @@ module Gitlab
|
|||
def cached_application_settings
|
||||
begin
|
||||
::ApplicationSetting.cached
|
||||
rescue ::Redis::BaseError, ::Errno::ENOENT
|
||||
rescue ::Redis::BaseError, ::Errno::ENOENT, ::Errno::EADDRNOTAVAIL
|
||||
# In case Redis isn't running or the Redis UNIX socket file is not available
|
||||
end
|
||||
end
|
||||
|
|
|
@ -0,0 +1,51 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Milestones::DestroyService, services: true do
|
||||
let(:user) { create(:user) }
|
||||
let(:project) { create(:project) }
|
||||
let(:milestone) { create(:milestone, title: 'Milestone v1.0', project: project) }
|
||||
let(:issue) { create(:issue, project: project, milestone: milestone) }
|
||||
let(:merge_request) { create(:merge_request, source_project: project, milestone: milestone) }
|
||||
|
||||
before do
|
||||
project.team << [user, :master]
|
||||
end
|
||||
|
||||
def service
|
||||
described_class.new(project, user, {})
|
||||
end
|
||||
|
||||
describe '#execute' do
|
||||
it 'deletes milestone' do
|
||||
service.execute(milestone)
|
||||
|
||||
expect { milestone.reload }.to raise_error ActiveRecord::RecordNotFound
|
||||
end
|
||||
|
||||
it 'deletes milestone id from issuables' do
|
||||
service.execute(milestone)
|
||||
|
||||
expect(issue.reload.milestone).to be_nil
|
||||
expect(merge_request.reload.milestone).to be_nil
|
||||
end
|
||||
|
||||
context 'group milestones' do
|
||||
let(:group) { create(:group) }
|
||||
let(:group_milestone) { create(:milestone, group: group) }
|
||||
|
||||
before do
|
||||
project.update(namespace: group)
|
||||
group.add_developer(user)
|
||||
end
|
||||
|
||||
it { expect(service.execute(group_milestone)).to be_nil }
|
||||
|
||||
it 'does not update milestone issuables' do
|
||||
expect(MergeRequests::UpdateService).not_to receive(:new)
|
||||
expect(Issues::UpdateService).not_to receive(:new)
|
||||
|
||||
service.execute(group_milestone)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue