Commit d261f836 authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg Committed by Douwe Maan

Update Carrierwave and fog-core

parent 3d318f3c
...@@ -85,14 +85,14 @@ gem 'kaminari', '~> 0.17.0' ...@@ -85,14 +85,14 @@ gem 'kaminari', '~> 0.17.0'
gem 'hamlit', '~> 2.6.1' gem 'hamlit', '~> 2.6.1'
# Files attachments # Files attachments
gem 'carrierwave', '~> 0.11.0' gem 'carrierwave', '~> 1.0'
# Drag and Drop UI # Drag and Drop UI
gem 'dropzonejs-rails', '~> 0.7.1' gem 'dropzonejs-rails', '~> 0.7.1'
# for backups # for backups
gem 'fog-aws', '~> 0.9' gem 'fog-aws', '~> 0.9'
gem 'fog-core', '~> 1.40' gem 'fog-core', '~> 1.44'
gem 'fog-google', '~> 0.5' gem 'fog-google', '~> 0.5'
gem 'fog-local', '~> 0.3' gem 'fog-local', '~> 0.3'
gem 'fog-openstack', '~> 0.1' gem 'fog-openstack', '~> 0.1'
......
...@@ -105,12 +105,10 @@ GEM ...@@ -105,12 +105,10 @@ GEM
capybara-screenshot (1.0.14) capybara-screenshot (1.0.14)
capybara (>= 1.0, < 3) capybara (>= 1.0, < 3)
launchy launchy
carrierwave (0.11.2) carrierwave (1.0.0)
activemodel (>= 3.2.0) activemodel (>= 4.0.0)
activesupport (>= 3.2.0) activesupport (>= 4.0.0)
json (>= 1.7)
mime-types (>= 1.16) mime-types (>= 1.16)
mimemagic (>= 0.3.0)
cause (0.1) cause (0.1)
charlock_holmes (0.7.3) charlock_holmes (0.7.3)
chronic (0.10.2) chronic (0.10.2)
...@@ -184,7 +182,7 @@ GEM ...@@ -184,7 +182,7 @@ GEM
erubis (2.7.0) erubis (2.7.0)
escape_utils (1.1.1) escape_utils (1.1.1)
eventmachine (1.0.8) eventmachine (1.0.8)
excon (0.52.0) excon (0.55.0)
execjs (2.6.0) execjs (2.6.0)
expression_parser (0.9.0) expression_parser (0.9.0)
extlib (0.9.16) extlib (0.9.16)
...@@ -210,12 +208,12 @@ GEM ...@@ -210,12 +208,12 @@ GEM
flowdock (0.7.1) flowdock (0.7.1)
httparty (~> 0.7) httparty (~> 0.7)
multi_json multi_json
fog-aws (0.11.0) fog-aws (0.13.0)
fog-core (~> 1.38) fog-core (~> 1.38)
fog-json (~> 1.0) fog-json (~> 1.0)
fog-xml (~> 0.1) fog-xml (~> 0.1)
ipaddress (~> 0.8) ipaddress (~> 0.8)
fog-core (1.42.0) fog-core (1.44.1)
builder builder
excon (~> 0.49) excon (~> 0.49)
formatador (~> 0.2) formatador (~> 0.2)
...@@ -237,9 +235,9 @@ GEM ...@@ -237,9 +235,9 @@ GEM
fog-json (>= 1.0) fog-json (>= 1.0)
fog-xml (>= 0.1) fog-xml (>= 0.1)
ipaddress (>= 0.8) ipaddress (>= 0.8)
fog-xml (0.1.2) fog-xml (0.1.3)
fog-core fog-core
nokogiri (~> 1.5, >= 1.5.11) nokogiri (>= 1.5.11, < 2.0.0)
font-awesome-rails (4.7.0.1) font-awesome-rails (4.7.0.1)
railties (>= 3.2, < 5.1) railties (>= 3.2, < 5.1)
foreman (0.78.0) foreman (0.78.0)
...@@ -871,7 +869,7 @@ DEPENDENCIES ...@@ -871,7 +869,7 @@ DEPENDENCIES
bundler-audit (~> 0.5.0) bundler-audit (~> 0.5.0)
capybara (~> 2.6.2) capybara (~> 2.6.2)
capybara-screenshot (~> 1.0.0) capybara-screenshot (~> 1.0.0)
carrierwave (~> 0.11.0) carrierwave (~> 1.0)
charlock_holmes (~> 0.7.3) charlock_holmes (~> 0.7.3)
chronic (~> 0.10.2) chronic (~> 0.10.2)
chronic_duration (~> 0.10.6) chronic_duration (~> 0.10.6)
...@@ -896,7 +894,7 @@ DEPENDENCIES ...@@ -896,7 +894,7 @@ DEPENDENCIES
ffaker (~> 2.4) ffaker (~> 2.4)
flay (~> 2.8.0) flay (~> 2.8.0)
fog-aws (~> 0.9) fog-aws (~> 0.9)
fog-core (~> 1.40) fog-core (~> 1.44)
fog-google (~> 0.5) fog-google (~> 0.5)
fog-local (~> 0.3) fog-local (~> 0.3)
fog-openstack (~> 0.1) fog-openstack (~> 0.1)
......
...@@ -8,7 +8,7 @@ class ExpireBuildInstanceArtifactsWorker ...@@ -8,7 +8,7 @@ class ExpireBuildInstanceArtifactsWorker
.reorder(nil) .reorder(nil)
.find_by(id: build_id) .find_by(id: build_id)
return unless build.try(:project) return unless build&.project && !build.project.pending_delete
Rails.logger.info "Removing artifacts for build #{build.id}..." Rails.logger.info "Removing artifacts for build #{build.id}..."
build.erase_artifacts! build.erase_artifacts!
......
...@@ -6,6 +6,8 @@ if File.exist?(aws_file) ...@@ -6,6 +6,8 @@ if File.exist?(aws_file)
AWS_CONFIG = YAML.load(File.read(aws_file))[Rails.env] AWS_CONFIG = YAML.load(File.read(aws_file))[Rails.env]
CarrierWave.configure do |config| CarrierWave.configure do |config|
config.fog_provider = 'fog/aws'
config.fog_credentials = { config.fog_credentials = {
provider: 'AWS', # required provider: 'AWS', # required
aws_access_key_id: AWS_CONFIG['access_key_id'], # required aws_access_key_id: AWS_CONFIG['access_key_id'], # required
......
...@@ -32,6 +32,10 @@ FactoryGirl.define do ...@@ -32,6 +32,10 @@ FactoryGirl.define do
request_access_enabled true request_access_enabled true
end end
trait :with_avatar do
avatar { File.open(Rails.root.join('spec/fixtures/dk.png')) }
end
trait :repository do trait :repository do
# no-op... for now! # no-op... for now!
end end
......
...@@ -781,17 +781,14 @@ describe Project, models: true do ...@@ -781,17 +781,14 @@ describe Project, models: true do
let(:project) { create(:empty_project) } let(:project) { create(:empty_project) }
context 'When avatar file is uploaded' do context 'when avatar file is uploaded' do
before do let(:project) { create(:empty_project, :with_avatar) }
project.update_columns(avatar: 'uploads/avatar.png')
allow(project.avatar).to receive(:present?) { true }
end
let(:avatar_path) do it 'creates a correct avatar path' do
"/uploads/project/avatar/#{project.id}/uploads/avatar.png" avatar_path = "/uploads/project/avatar/#{project.id}/dk.png"
end
it { should eq "http://#{Gitlab.config.gitlab.host}#{avatar_path}" } expect(project.avatar_url).to eq("http://#{Gitlab.config.gitlab.host}#{avatar_path}")
end
end end
context 'When avatar file in git' do context 'When avatar file in git' do
......
...@@ -34,12 +34,14 @@ describe ExpireBuildInstanceArtifactsWorker do ...@@ -34,12 +34,14 @@ describe ExpireBuildInstanceArtifactsWorker do
context 'when associated project was removed' do context 'when associated project was removed' do
let(:build) do let(:build) do
create(:ci_build, :artifacts, artifacts_expiry) do |build| create(:ci_build, :artifacts, artifacts_expiry) do |build|
build.project.delete build.project.pending_delete = true
end end
end end
it 'does not remove artifacts' do it 'does not remove artifacts' do
expect(build.reload.artifacts_file.exists?).to be_truthy expect do
build.reload.artifacts_file
end.not_to raise_error
end end
end end
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment