Merge remote-tracking branch 'upstream/master' into set-default-cache-key-for-jobs
* upstream/master: (289 commits) re-add Assign to Me link on new MR/Issue forms thinner bottom header border make header match old 16px padding of body contents Update font-awesome-rails to 4.7.0.1 Relax font-awesome-rails dependency to ~> 4.7 Restore keyboard shortcuts for "Activity" and "Charts" fix border radius bottom for header match padding for mr-widget sections Update changelog Fix project-last-commit alignment Docs: update GL Pages IP on GL.com Fix up @DouweM review Remove readme-only project view preference Add `uploads` to known models for Import/Export spec Add `has_many` associations for models that can have Upload records Handle relative and absolute Upload paths in the Uploaders Change the default CarrierWave root path for tests Fix Projects::UploadService spec Add a Project::UploadsController spec to ensure an Upload is created Add `RecordsUploads` module to record Upload records via callbacks ...
|
@ -23,7 +23,7 @@
|
|||
}
|
||||
},
|
||||
"rules": {
|
||||
"filenames/match-regex": [2, "^[a-z0-9_]+(.js)?$"],
|
||||
"filenames/match-regex": [2, "^[a-z0-9_]+$"],
|
||||
"no-multiple-empty-lines": ["error", { "max": 1 }]
|
||||
}
|
||||
}
|
||||
|
|
|
@ -300,7 +300,7 @@ bundler:audit:
|
|||
- master@gitlab/gitlabhq
|
||||
- master@gitlab/gitlab-ee
|
||||
script:
|
||||
- "bundle exec bundle-audit check --update --ignore OSVDB-115941 CVE-2016-6316 CVE-2016-6317"
|
||||
- "bundle exec bundle-audit check --update"
|
||||
|
||||
migration paths:
|
||||
stage: test
|
||||
|
@ -421,6 +421,7 @@ pages:
|
|||
- public
|
||||
only:
|
||||
- master@gitlab-org/gitlab-ce
|
||||
- master@gitlab-org/gitlab-ee
|
||||
|
||||
# Insurance in case a gem needed by one of our releases gets yanked from
|
||||
# rubygems.org in the future.
|
||||
|
@ -437,3 +438,4 @@ cache gems:
|
|||
- vendor/cache
|
||||
only:
|
||||
- master@gitlab-org/gitlab-ce
|
||||
- master@gitlab-org/gitlab-ee
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
0.3.0
|
|
@ -1 +1 @@
|
|||
1.3.0
|
||||
1.4.0
|
||||
|
|
8
Gemfile
|
@ -79,7 +79,7 @@ gem 'kaminari', '~> 0.17.0'
|
|||
gem 'hamlit', '~> 2.6.1'
|
||||
|
||||
# Files attachments
|
||||
gem 'carrierwave', '~> 0.10.0'
|
||||
gem 'carrierwave', '~> 0.11.0'
|
||||
|
||||
# Drag and Drop UI
|
||||
gem 'dropzonejs-rails', '~> 0.7.1'
|
||||
|
@ -105,7 +105,7 @@ gem 'seed-fu', '~> 2.3.5'
|
|||
gem 'html-pipeline', '~> 1.11.0'
|
||||
gem 'deckar01-task_list', '1.0.6', require: 'task_list/railtie'
|
||||
gem 'gitlab-markup', '~> 1.5.1'
|
||||
gem 'redcarpet', '~> 3.3.3'
|
||||
gem 'redcarpet', '~> 3.4'
|
||||
gem 'RedCloth', '~> 4.3.2'
|
||||
gem 'rdoc', '~> 4.2'
|
||||
gem 'org-ruby', '~> 0.9.12'
|
||||
|
@ -231,7 +231,7 @@ gem 'uglifier', '~> 2.7.2'
|
|||
|
||||
gem 'addressable', '~> 2.3.8'
|
||||
gem 'bootstrap-sass', '~> 3.3.0'
|
||||
gem 'font-awesome-rails', '~> 4.6.1'
|
||||
gem 'font-awesome-rails', '~> 4.7'
|
||||
gem 'gemojione', '~> 3.0'
|
||||
gem 'gon', '~> 6.1.0'
|
||||
gem 'jquery-atwho-rails', '~> 1.3.2'
|
||||
|
@ -344,7 +344,7 @@ gem 'oauth2', '~> 1.2.0'
|
|||
gem 'paranoia', '~> 2.2'
|
||||
|
||||
# Health check
|
||||
gem 'health_check', '~> 2.2.0'
|
||||
gem 'health_check', '~> 2.6.0'
|
||||
|
||||
# System information
|
||||
gem 'vmstat', '~> 2.3.0'
|
||||
|
|
17
Gemfile.lock
|
@ -103,11 +103,12 @@ GEM
|
|||
capybara-screenshot (1.0.11)
|
||||
capybara (>= 1.0, < 3)
|
||||
launchy
|
||||
carrierwave (0.10.0)
|
||||
carrierwave (0.11.2)
|
||||
activemodel (>= 3.2.0)
|
||||
activesupport (>= 3.2.0)
|
||||
json (>= 1.7)
|
||||
mime-types (>= 1.16)
|
||||
mimemagic (>= 0.3.0)
|
||||
cause (0.1)
|
||||
charlock_holmes (0.7.3)
|
||||
chronic (0.10.2)
|
||||
|
@ -231,7 +232,7 @@ GEM
|
|||
fog-xml (0.1.2)
|
||||
fog-core
|
||||
nokogiri (~> 1.5, >= 1.5.11)
|
||||
font-awesome-rails (4.6.1.0)
|
||||
font-awesome-rails (4.7.0.1)
|
||||
railties (>= 3.2, < 5.1)
|
||||
foreman (0.78.0)
|
||||
thor (~> 0.19.1)
|
||||
|
@ -336,7 +337,7 @@ GEM
|
|||
thor
|
||||
tilt
|
||||
hashie (3.5.5)
|
||||
health_check (2.2.1)
|
||||
health_check (2.6.0)
|
||||
rails (>= 4.0)
|
||||
hipchat (1.5.2)
|
||||
httparty
|
||||
|
@ -583,7 +584,7 @@ GEM
|
|||
recaptcha (3.0.0)
|
||||
json
|
||||
recursive-open-struct (1.0.0)
|
||||
redcarpet (3.3.3)
|
||||
redcarpet (3.4.0)
|
||||
redis (3.2.2)
|
||||
redis-actionpack (5.0.1)
|
||||
actionpack (>= 4.0, < 6)
|
||||
|
@ -850,7 +851,7 @@ DEPENDENCIES
|
|||
bundler-audit (~> 0.5.0)
|
||||
capybara (~> 2.6.2)
|
||||
capybara-screenshot (~> 1.0.0)
|
||||
carrierwave (~> 0.10.0)
|
||||
carrierwave (~> 0.11.0)
|
||||
charlock_holmes (~> 0.7.3)
|
||||
chronic (~> 0.10.2)
|
||||
chronic_duration (~> 0.10.6)
|
||||
|
@ -877,7 +878,7 @@ DEPENDENCIES
|
|||
fog-local (~> 0.3)
|
||||
fog-openstack (~> 0.1)
|
||||
fog-rackspace (~> 0.1.1)
|
||||
font-awesome-rails (~> 4.6.1)
|
||||
font-awesome-rails (~> 4.7)
|
||||
foreman (~> 0.78.0)
|
||||
fuubar (~> 2.0.0)
|
||||
gemnasium-gitlab-service (~> 0.2)
|
||||
|
@ -895,7 +896,7 @@ DEPENDENCIES
|
|||
grape-entity (~> 0.6.0)
|
||||
haml_lint (~> 0.21.0)
|
||||
hamlit (~> 2.6.1)
|
||||
health_check (~> 2.2.0)
|
||||
health_check (~> 2.6.0)
|
||||
hipchat (~> 1.5.0)
|
||||
html-pipeline (~> 1.11.0)
|
||||
html2text
|
||||
|
@ -955,7 +956,7 @@ DEPENDENCIES
|
|||
rblineprof (~> 0.3.6)
|
||||
rdoc (~> 4.2)
|
||||
recaptcha (~> 3.0)
|
||||
redcarpet (~> 3.3.3)
|
||||
redcarpet (~> 3.4)
|
||||
redis (~> 3.2)
|
||||
redis-namespace (~> 1.5.2)
|
||||
redis-rails (~> 5.0.1)
|
||||
|
|
Before Width: | Height: | Size: 1.0 MiB After Width: | Height: | Size: 1.2 MiB |
After Width: | Height: | Size: 793 B |
After Width: | Height: | Size: 676 B |
After Width: | Height: | Size: 821 B |
After Width: | Height: | Size: 810 B |
After Width: | Height: | Size: 469 B |
After Width: | Height: | Size: 505 B |
After Width: | Height: | Size: 646 B |
After Width: | Height: | Size: 670 B |
After Width: | Height: | Size: 491 B |
After Width: | Height: | Size: 759 B |
After Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 1.0 KiB |
After Width: | Height: | Size: 953 B |
After Width: | Height: | Size: 839 B |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 1.0 KiB |
After Width: | Height: | Size: 779 B |
After Width: | Height: | Size: 2.0 KiB |
After Width: | Height: | Size: 2.0 KiB |
After Width: | Height: | Size: 2.0 KiB |
After Width: | Height: | Size: 2.0 KiB |
After Width: | Height: | Size: 2.0 KiB |
After Width: | Height: | Size: 2.0 KiB |
After Width: | Height: | Size: 594 B |
After Width: | Height: | Size: 551 B |
After Width: | Height: | Size: 845 B |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 655 B |
After Width: | Height: | Size: 648 B |
After Width: | Height: | Size: 711 B |
After Width: | Height: | Size: 429 B |
After Width: | Height: | Size: 543 B |
After Width: | Height: | Size: 535 B |
After Width: | Height: | Size: 512 B |
After Width: | Height: | Size: 455 B |
After Width: | Height: | Size: 429 B |
After Width: | Height: | Size: 563 B |
After Width: | Height: | Size: 559 B |
After Width: | Height: | Size: 471 B |
After Width: | Height: | Size: 520 B |
After Width: | Height: | Size: 526 B |
After Width: | Height: | Size: 468 B |
After Width: | Height: | Size: 644 B |
After Width: | Height: | Size: 507 B |
After Width: | Height: | Size: 474 B |
After Width: | Height: | Size: 454 B |
After Width: | Height: | Size: 521 B |
After Width: | Height: | Size: 524 B |
After Width: | Height: | Size: 519 B |
After Width: | Height: | Size: 693 B |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 1.7 KiB |
After Width: | Height: | Size: 627 B |
After Width: | Height: | Size: 862 B |
After Width: | Height: | Size: 1.6 KiB |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 912 B |
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 391 B |
After Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 818 B |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 665 B |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 562 B |
After Width: | Height: | Size: 2.1 KiB |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 490 B |
After Width: | Height: | Size: 501 B |
After Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 639 B |
After Width: | Height: | Size: 1.9 KiB |
After Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 390 B |
After Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 408 B |
After Width: | Height: | Size: 820 B |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 1.2 KiB |