Merge branch 'update-fog' into 'master'
Bump fog to 1.36.0 Updates AWS regions and fixes a number of bugs. Tested a GitLab AWS backup without any issues. Closes #4231 See merge request !2373
This commit is contained in:
commit
c4511a1234
3 changed files with 65 additions and 18 deletions
|
@ -1,6 +1,7 @@
|
||||||
Please view this file on the master branch, on stable branches it's out of date.
|
Please view this file on the master branch, on stable branches it's out of date.
|
||||||
|
|
||||||
v 8.4.0 (unreleased)
|
v 8.4.0 (unreleased)
|
||||||
|
- Bump fog to 1.36.0 (Stan Hu)
|
||||||
- Add housekeeping function to project settings page
|
- Add housekeeping function to project settings page
|
||||||
- The default GitLab logo now acts as a loading indicator
|
- The default GitLab logo now acts as a loading indicator
|
||||||
- Fix caching issue where build status was not updating in project dashboard (Stan Hu)
|
- Fix caching issue where build status was not updating in project dashboard (Stan Hu)
|
||||||
|
|
2
Gemfile
2
Gemfile
|
@ -80,7 +80,7 @@ gem "carrierwave", '~> 0.9.0'
|
||||||
gem 'dropzonejs-rails', '~> 0.7.1'
|
gem 'dropzonejs-rails', '~> 0.7.1'
|
||||||
|
|
||||||
# for aws storage
|
# for aws storage
|
||||||
gem "fog", "~> 1.25.0"
|
gem "fog", "~> 1.36.0"
|
||||||
gem "unf", '~> 0.1.4'
|
gem "unf", '~> 0.1.4'
|
||||||
|
|
||||||
# Authorization
|
# Authorization
|
||||||
|
|
80
Gemfile.lock
80
Gemfile.lock
|
@ -219,21 +219,45 @@ GEM
|
||||||
flowdock (0.7.1)
|
flowdock (0.7.1)
|
||||||
httparty (~> 0.7)
|
httparty (~> 0.7)
|
||||||
multi_json
|
multi_json
|
||||||
fog (1.25.0)
|
fog (1.36.0)
|
||||||
|
fog-aliyun (>= 0.1.0)
|
||||||
|
fog-atmos
|
||||||
|
fog-aws (>= 0.6.0)
|
||||||
fog-brightbox (~> 0.4)
|
fog-brightbox (~> 0.4)
|
||||||
fog-core (~> 1.25)
|
fog-core (~> 1.32)
|
||||||
|
fog-dynect (~> 0.0.2)
|
||||||
|
fog-ecloud (~> 0.1)
|
||||||
|
fog-google (<= 0.1.0)
|
||||||
fog-json
|
fog-json
|
||||||
|
fog-local
|
||||||
|
fog-powerdns (>= 0.1.1)
|
||||||
fog-profitbricks
|
fog-profitbricks
|
||||||
fog-radosgw (>= 0.0.2)
|
fog-radosgw (>= 0.0.2)
|
||||||
|
fog-riakcs
|
||||||
fog-sakuracloud (>= 0.0.4)
|
fog-sakuracloud (>= 0.0.4)
|
||||||
|
fog-serverlove
|
||||||
fog-softlayer
|
fog-softlayer
|
||||||
|
fog-storm_on_demand
|
||||||
fog-terremark
|
fog-terremark
|
||||||
fog-vmfusion
|
fog-vmfusion
|
||||||
fog-voxel
|
fog-voxel
|
||||||
|
fog-xenserver
|
||||||
fog-xml (~> 0.1.1)
|
fog-xml (~> 0.1.1)
|
||||||
ipaddress (~> 0.5)
|
ipaddress (~> 0.5)
|
||||||
nokogiri (~> 1.5, >= 1.5.11)
|
nokogiri (~> 1.5, >= 1.5.11)
|
||||||
opennebula
|
fog-aliyun (0.1.0)
|
||||||
|
fog-core (~> 1.27)
|
||||||
|
fog-json (~> 1.0)
|
||||||
|
ipaddress (~> 0.8)
|
||||||
|
xml-simple (~> 1.1)
|
||||||
|
fog-atmos (0.1.0)
|
||||||
|
fog-core
|
||||||
|
fog-xml
|
||||||
|
fog-aws (0.8.1)
|
||||||
|
fog-core (~> 1.27)
|
||||||
|
fog-json (~> 1.0)
|
||||||
|
fog-xml (~> 0.1)
|
||||||
|
ipaddress (~> 0.8)
|
||||||
fog-brightbox (0.10.1)
|
fog-brightbox (0.10.1)
|
||||||
fog-core (~> 1.22)
|
fog-core (~> 1.22)
|
||||||
fog-json
|
fog-json
|
||||||
|
@ -242,21 +266,48 @@ GEM
|
||||||
builder
|
builder
|
||||||
excon (~> 0.45)
|
excon (~> 0.45)
|
||||||
formatador (~> 0.2)
|
formatador (~> 0.2)
|
||||||
|
fog-dynect (0.0.2)
|
||||||
|
fog-core
|
||||||
|
fog-json
|
||||||
|
fog-xml
|
||||||
|
fog-ecloud (0.3.0)
|
||||||
|
fog-core
|
||||||
|
fog-xml
|
||||||
|
fog-google (0.1.0)
|
||||||
|
fog-core
|
||||||
|
fog-json
|
||||||
|
fog-xml
|
||||||
fog-json (1.0.2)
|
fog-json (1.0.2)
|
||||||
fog-core (~> 1.0)
|
fog-core (~> 1.0)
|
||||||
multi_json (~> 1.10)
|
multi_json (~> 1.10)
|
||||||
|
fog-local (0.2.1)
|
||||||
|
fog-core (~> 1.27)
|
||||||
|
fog-powerdns (0.1.1)
|
||||||
|
fog-core (~> 1.27)
|
||||||
|
fog-json (~> 1.0)
|
||||||
|
fog-xml (~> 0.1)
|
||||||
fog-profitbricks (0.0.5)
|
fog-profitbricks (0.0.5)
|
||||||
fog-core
|
fog-core
|
||||||
fog-xml
|
fog-xml
|
||||||
nokogiri
|
nokogiri
|
||||||
fog-radosgw (0.0.4)
|
fog-radosgw (0.0.5)
|
||||||
fog-core (>= 1.21.0)
|
fog-core (>= 1.21.0)
|
||||||
fog-json
|
fog-json
|
||||||
fog-xml (>= 0.0.1)
|
fog-xml (>= 0.0.1)
|
||||||
fog-sakuracloud (1.5.0)
|
fog-riakcs (0.1.0)
|
||||||
fog-core
|
fog-core
|
||||||
fog-json
|
fog-json
|
||||||
fog-softlayer (1.0.2)
|
fog-xml
|
||||||
|
fog-sakuracloud (1.7.5)
|
||||||
|
fog-core
|
||||||
|
fog-json
|
||||||
|
fog-serverlove (0.1.2)
|
||||||
|
fog-core
|
||||||
|
fog-json
|
||||||
|
fog-softlayer (1.0.3)
|
||||||
|
fog-core
|
||||||
|
fog-json
|
||||||
|
fog-storm_on_demand (0.1.1)
|
||||||
fog-core
|
fog-core
|
||||||
fog-json
|
fog-json
|
||||||
fog-terremark (0.1.0)
|
fog-terremark (0.1.0)
|
||||||
|
@ -268,6 +319,9 @@ GEM
|
||||||
fog-voxel (0.1.0)
|
fog-voxel (0.1.0)
|
||||||
fog-core
|
fog-core
|
||||||
fog-xml
|
fog-xml
|
||||||
|
fog-xenserver (0.2.2)
|
||||||
|
fog-core
|
||||||
|
fog-xml
|
||||||
fog-xml (0.1.2)
|
fog-xml (0.1.2)
|
||||||
fog-core
|
fog-core
|
||||||
nokogiri (~> 1.5, >= 1.5.11)
|
nokogiri (~> 1.5, >= 1.5.11)
|
||||||
|
@ -377,7 +431,7 @@ GEM
|
||||||
influxdb (0.2.3)
|
influxdb (0.2.3)
|
||||||
cause
|
cause
|
||||||
json
|
json
|
||||||
ipaddress (0.8.0)
|
ipaddress (0.8.2)
|
||||||
jquery-atwho-rails (1.3.2)
|
jquery-atwho-rails (1.3.2)
|
||||||
jquery-rails (4.0.5)
|
jquery-rails (4.0.5)
|
||||||
rails-dom-testing (~> 1.0)
|
rails-dom-testing (~> 1.0)
|
||||||
|
@ -492,10 +546,6 @@ GEM
|
||||||
activesupport
|
activesupport
|
||||||
nokogiri (>= 1.4.4)
|
nokogiri (>= 1.4.4)
|
||||||
omniauth (~> 1.0)
|
omniauth (~> 1.0)
|
||||||
opennebula (4.14.2)
|
|
||||||
json
|
|
||||||
nokogiri
|
|
||||||
rbvmomi
|
|
||||||
org-ruby (0.9.12)
|
org-ruby (0.9.12)
|
||||||
rubypants (~> 0.2)
|
rubypants (~> 0.2)
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
|
@ -571,10 +621,6 @@ GEM
|
||||||
ffi (>= 0.5.0)
|
ffi (>= 0.5.0)
|
||||||
rblineprof (0.3.6)
|
rblineprof (0.3.6)
|
||||||
debugger-ruby_core_source (~> 1.3)
|
debugger-ruby_core_source (~> 1.3)
|
||||||
rbvmomi (1.8.2)
|
|
||||||
builder
|
|
||||||
nokogiri (>= 1.4.1)
|
|
||||||
trollop
|
|
||||||
rdoc (3.12.2)
|
rdoc (3.12.2)
|
||||||
json (~> 1.4)
|
json (~> 1.4)
|
||||||
recaptcha (1.0.2)
|
recaptcha (1.0.2)
|
||||||
|
@ -773,7 +819,6 @@ GEM
|
||||||
multi_json (~> 1.7)
|
multi_json (~> 1.7)
|
||||||
twitter-stream (~> 0.1)
|
twitter-stream (~> 0.1)
|
||||||
tins (1.6.0)
|
tins (1.6.0)
|
||||||
trollop (2.1.2)
|
|
||||||
turbolinks (2.5.3)
|
turbolinks (2.5.3)
|
||||||
coffee-rails
|
coffee-rails
|
||||||
twitter-stream (0.1.16)
|
twitter-stream (0.1.16)
|
||||||
|
@ -822,6 +867,7 @@ GEM
|
||||||
builder
|
builder
|
||||||
expression_parser
|
expression_parser
|
||||||
rinku
|
rinku
|
||||||
|
xml-simple (1.1.5)
|
||||||
xpath (2.0.0)
|
xpath (2.0.0)
|
||||||
nokogiri (~> 1.3)
|
nokogiri (~> 1.3)
|
||||||
|
|
||||||
|
@ -877,7 +923,7 @@ DEPENDENCIES
|
||||||
ffaker (~> 2.0.0)
|
ffaker (~> 2.0.0)
|
||||||
flay
|
flay
|
||||||
flog
|
flog
|
||||||
fog (~> 1.25.0)
|
fog (~> 1.36.0)
|
||||||
font-awesome-rails (~> 4.2)
|
font-awesome-rails (~> 4.2)
|
||||||
foreman
|
foreman
|
||||||
fuubar (~> 2.0.0)
|
fuubar (~> 2.0.0)
|
||||||
|
|
Loading…
Reference in a new issue