Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
This commit is contained in:
commit
5a9135ade8
|
@ -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 7.12.0 (unreleased)
|
v 7.12.0 (unreleased)
|
||||||
|
- Update browser gem to version 0.8.0 for IE11 support (Stan Hu)
|
||||||
- Fix timeout when rendering file with thousands of lines.
|
- Fix timeout when rendering file with thousands of lines.
|
||||||
- Add "Remember me" checkbox to LDAP signin form.
|
- Add "Remember me" checkbox to LDAP signin form.
|
||||||
- Don't notify users mentioned in code blocks or blockquotes.
|
- Don't notify users mentioned in code blocks or blockquotes.
|
||||||
|
|
4
Gemfile
4
Gemfile
|
@ -30,7 +30,7 @@ gem 'rqrcode-rails3'
|
||||||
gem 'attr_encrypted', '1.3.4'
|
gem 'attr_encrypted', '1.3.4'
|
||||||
|
|
||||||
# Browser detection
|
# Browser detection
|
||||||
gem "browser"
|
gem "browser", '~> 0.8.0'
|
||||||
|
|
||||||
# Extracting information from a git repository
|
# Extracting information from a git repository
|
||||||
# Provide access to Gitlab::Git library
|
# Provide access to Gitlab::Git library
|
||||||
|
@ -81,7 +81,7 @@ gem "carrierwave"
|
||||||
gem 'dropzonejs-rails'
|
gem 'dropzonejs-rails'
|
||||||
|
|
||||||
# for aws storage
|
# for aws storage
|
||||||
gem "fog", "~> 1.14"
|
gem "fog", "~> 1.25.0"
|
||||||
gem "unf"
|
gem "unf"
|
||||||
|
|
||||||
# Authorization
|
# Authorization
|
||||||
|
|
86
Gemfile.lock
86
Gemfile.lock
|
@ -1,6 +1,7 @@
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
|
CFPropertyList (2.3.1)
|
||||||
RedCloth (4.2.9)
|
RedCloth (4.2.9)
|
||||||
ace-rails-ap (2.0.1)
|
ace-rails-ap (2.0.1)
|
||||||
actionmailer (4.1.9)
|
actionmailer (4.1.9)
|
||||||
|
@ -75,7 +76,7 @@ GEM
|
||||||
ruby_parser (~> 3.5.0)
|
ruby_parser (~> 3.5.0)
|
||||||
sass (~> 3.0)
|
sass (~> 3.0)
|
||||||
terminal-table (~> 1.4)
|
terminal-table (~> 1.4)
|
||||||
browser (0.7.2)
|
browser (0.8.0)
|
||||||
builder (3.2.2)
|
builder (3.2.2)
|
||||||
byebug (3.2.0)
|
byebug (3.2.0)
|
||||||
columnize (~> 0.8)
|
columnize (~> 0.8)
|
||||||
|
@ -163,7 +164,7 @@ GEM
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
escape_utils (0.2.4)
|
escape_utils (0.2.4)
|
||||||
eventmachine (1.0.4)
|
eventmachine (1.0.4)
|
||||||
excon (0.32.1)
|
excon (0.45.3)
|
||||||
execjs (2.5.2)
|
execjs (2.5.2)
|
||||||
expression_parser (0.9.0)
|
expression_parser (0.9.0)
|
||||||
factory_girl (4.3.0)
|
factory_girl (4.3.0)
|
||||||
|
@ -178,29 +179,69 @@ GEM
|
||||||
fastercsv (1.5.5)
|
fastercsv (1.5.5)
|
||||||
ffaker (2.0.0)
|
ffaker (2.0.0)
|
||||||
ffi (1.9.8)
|
ffi (1.9.8)
|
||||||
fog (1.21.0)
|
fission (0.5.0)
|
||||||
fog-brightbox
|
CFPropertyList (~> 2.2)
|
||||||
fog-core (~> 1.21, >= 1.21.1)
|
fog (1.25.0)
|
||||||
|
fog-brightbox (~> 0.4)
|
||||||
|
fog-core (~> 1.25)
|
||||||
fog-json
|
fog-json
|
||||||
|
fog-profitbricks
|
||||||
|
fog-radosgw (>= 0.0.2)
|
||||||
|
fog-sakuracloud (>= 0.0.4)
|
||||||
|
fog-softlayer
|
||||||
|
fog-terremark
|
||||||
|
fog-vmfusion
|
||||||
|
fog-voxel
|
||||||
|
fog-xml (~> 0.1.1)
|
||||||
|
ipaddress (~> 0.5)
|
||||||
nokogiri (~> 1.5, >= 1.5.11)
|
nokogiri (~> 1.5, >= 1.5.11)
|
||||||
fog-brightbox (0.0.1)
|
opennebula
|
||||||
fog-core
|
fog-brightbox (0.7.1)
|
||||||
|
fog-core (~> 1.22)
|
||||||
fog-json
|
fog-json
|
||||||
fog-core (1.21.1)
|
inflecto (~> 0.0.2)
|
||||||
|
fog-core (1.30.0)
|
||||||
builder
|
builder
|
||||||
excon (~> 0.32)
|
excon (~> 0.45)
|
||||||
formatador (~> 0.2.0)
|
formatador (~> 0.2)
|
||||||
mime-types
|
mime-types
|
||||||
net-scp (~> 1.1)
|
net-scp (~> 1.1)
|
||||||
net-ssh (>= 2.1.3)
|
net-ssh (>= 2.1.3)
|
||||||
fog-json (1.0.0)
|
fog-json (1.0.2)
|
||||||
multi_json (~> 1.0)
|
fog-core (~> 1.0)
|
||||||
|
multi_json (~> 1.10)
|
||||||
|
fog-profitbricks (0.0.3)
|
||||||
|
fog-core
|
||||||
|
fog-xml
|
||||||
|
nokogiri
|
||||||
|
fog-radosgw (0.0.4)
|
||||||
|
fog-core (>= 1.21.0)
|
||||||
|
fog-json
|
||||||
|
fog-xml (>= 0.0.1)
|
||||||
|
fog-sakuracloud (1.0.1)
|
||||||
|
fog-core
|
||||||
|
fog-json
|
||||||
|
fog-softlayer (0.4.6)
|
||||||
|
fog-core
|
||||||
|
fog-json
|
||||||
|
fog-terremark (0.1.0)
|
||||||
|
fog-core
|
||||||
|
fog-xml
|
||||||
|
fog-vmfusion (0.1.0)
|
||||||
|
fission
|
||||||
|
fog-core
|
||||||
|
fog-voxel (0.1.0)
|
||||||
|
fog-core
|
||||||
|
fog-xml
|
||||||
|
fog-xml (0.1.2)
|
||||||
|
fog-core
|
||||||
|
nokogiri (~> 1.5, >= 1.5.11)
|
||||||
font-awesome-rails (4.2.0.0)
|
font-awesome-rails (4.2.0.0)
|
||||||
railties (>= 3.2, < 5.0)
|
railties (>= 3.2, < 5.0)
|
||||||
foreman (0.63.0)
|
foreman (0.63.0)
|
||||||
dotenv (>= 0.7)
|
dotenv (>= 0.7)
|
||||||
thor (>= 0.13.6)
|
thor (>= 0.13.6)
|
||||||
formatador (0.2.4)
|
formatador (0.2.5)
|
||||||
gemnasium-gitlab-service (0.2.6)
|
gemnasium-gitlab-service (0.2.6)
|
||||||
rugged (~> 0.21)
|
rugged (~> 0.21)
|
||||||
gemojione (2.0.0)
|
gemojione (2.0.0)
|
||||||
|
@ -287,6 +328,8 @@ GEM
|
||||||
i18n (0.7.0)
|
i18n (0.7.0)
|
||||||
ice_cube (0.11.1)
|
ice_cube (0.11.1)
|
||||||
ice_nine (0.10.0)
|
ice_nine (0.10.0)
|
||||||
|
inflecto (0.0.2)
|
||||||
|
ipaddress (0.8.0)
|
||||||
jquery-atwho-rails (1.0.1)
|
jquery-atwho-rails (1.0.1)
|
||||||
jquery-rails (3.1.2)
|
jquery-rails (3.1.2)
|
||||||
railties (>= 3.0, < 5.0)
|
railties (>= 3.0, < 5.0)
|
||||||
|
@ -328,9 +371,9 @@ GEM
|
||||||
multipart-post (1.2.0)
|
multipart-post (1.2.0)
|
||||||
mysql2 (0.3.16)
|
mysql2 (0.3.16)
|
||||||
net-ldap (0.11)
|
net-ldap (0.11)
|
||||||
net-scp (1.1.2)
|
net-scp (1.2.1)
|
||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5)
|
||||||
net-ssh (2.8.0)
|
net-ssh (2.9.2)
|
||||||
newrelic_rpm (3.9.4.245)
|
newrelic_rpm (3.9.4.245)
|
||||||
nokogiri (1.6.6.2)
|
nokogiri (1.6.6.2)
|
||||||
mini_portile (~> 0.6.0)
|
mini_portile (~> 0.6.0)
|
||||||
|
@ -379,6 +422,10 @@ GEM
|
||||||
omniauth-twitter (1.0.1)
|
omniauth-twitter (1.0.1)
|
||||||
multi_json (~> 1.3)
|
multi_json (~> 1.3)
|
||||||
omniauth-oauth (~> 1.0)
|
omniauth-oauth (~> 1.0)
|
||||||
|
opennebula (4.12.1)
|
||||||
|
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)
|
||||||
|
@ -446,6 +493,10 @@ GEM
|
||||||
rb-fsevent (0.9.4)
|
rb-fsevent (0.9.4)
|
||||||
rb-inotify (0.9.5)
|
rb-inotify (0.9.5)
|
||||||
ffi (>= 0.5.0)
|
ffi (>= 0.5.0)
|
||||||
|
rbvmomi (1.8.2)
|
||||||
|
builder
|
||||||
|
nokogiri (>= 1.4.1)
|
||||||
|
trollop
|
||||||
rdoc (3.12.2)
|
rdoc (3.12.2)
|
||||||
json (~> 1.4)
|
json (~> 1.4)
|
||||||
redcarpet (3.2.3)
|
redcarpet (3.2.3)
|
||||||
|
@ -621,6 +672,7 @@ GEM
|
||||||
multi_json (~> 1.7)
|
multi_json (~> 1.7)
|
||||||
twitter-stream (~> 0.1)
|
twitter-stream (~> 0.1)
|
||||||
tins (0.13.1)
|
tins (0.13.1)
|
||||||
|
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)
|
||||||
|
@ -680,7 +732,7 @@ DEPENDENCIES
|
||||||
binding_of_caller
|
binding_of_caller
|
||||||
bootstrap-sass (~> 3.0)
|
bootstrap-sass (~> 3.0)
|
||||||
brakeman
|
brakeman
|
||||||
browser
|
browser (~> 0.8.0)
|
||||||
byebug
|
byebug
|
||||||
cal-heatmap-rails (~> 0.0.1)
|
cal-heatmap-rails (~> 0.0.1)
|
||||||
capybara (~> 2.2.1)
|
capybara (~> 2.2.1)
|
||||||
|
@ -704,7 +756,7 @@ DEPENDENCIES
|
||||||
enumerize
|
enumerize
|
||||||
factory_girl_rails
|
factory_girl_rails
|
||||||
ffaker (~> 2.0.0)
|
ffaker (~> 2.0.0)
|
||||||
fog (~> 1.14)
|
fog (~> 1.25.0)
|
||||||
font-awesome-rails (~> 4.2)
|
font-awesome-rails (~> 4.2)
|
||||||
foreman
|
foreman
|
||||||
gemnasium-gitlab-service (~> 0.2)
|
gemnasium-gitlab-service (~> 0.2)
|
||||||
|
|
|
@ -252,6 +252,9 @@ production: &base
|
||||||
# aws_secret_access_key: 'secret123'
|
# aws_secret_access_key: 'secret123'
|
||||||
# # The remote 'directory' to store your backups. For S3, this would be the bucket name.
|
# # The remote 'directory' to store your backups. For S3, this would be the bucket name.
|
||||||
# remote_directory: 'my.s3.bucket'
|
# remote_directory: 'my.s3.bucket'
|
||||||
|
# # Use multipart uploads when file size reaches 100MB, see
|
||||||
|
# # http://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html
|
||||||
|
# multipart_chunk_size: 104857600
|
||||||
|
|
||||||
## GitLab Shell settings
|
## GitLab Shell settings
|
||||||
gitlab_shell:
|
gitlab_shell:
|
||||||
|
|
|
@ -174,6 +174,7 @@ Settings.backup['upload'] ||= Settingslogic.new({ 'remote_directory' => nil, 'co
|
||||||
if Settings.backup['upload']['connection']
|
if Settings.backup['upload']['connection']
|
||||||
Settings.backup['upload']['connection'] = Hash[Settings.backup['upload']['connection'].map { |k, v| [k.to_sym, v] }]
|
Settings.backup['upload']['connection'] = Hash[Settings.backup['upload']['connection'].map { |k, v| [k.to_sym, v] }]
|
||||||
end
|
end
|
||||||
|
Settings.backup['upload']['multipart_chunk_size'] ||= 104857600
|
||||||
|
|
||||||
#
|
#
|
||||||
# Git
|
# Git
|
||||||
|
|
|
@ -46,7 +46,8 @@ module Backup
|
||||||
connection = ::Fog::Storage.new(connection_settings)
|
connection = ::Fog::Storage.new(connection_settings)
|
||||||
directory = connection.directories.get(remote_directory)
|
directory = connection.directories.get(remote_directory)
|
||||||
|
|
||||||
if directory.files.create(key: tar_file, body: File.open(tar_file), public: false)
|
if directory.files.create(key: tar_file, body: File.open(tar_file), public: false,
|
||||||
|
multipart_chunk_size: Gitlab.config.backup.upload.multipart_chunk_size)
|
||||||
$progress.puts "done".green
|
$progress.puts "done".green
|
||||||
else
|
else
|
||||||
puts "uploading backup to #{remote_directory} failed".red
|
puts "uploading backup to #{remote_directory} failed".red
|
||||||
|
|
Loading…
Reference in New Issue