[ARVADOS] updated: 1.1.3-78-g39c3bbe
Git user
git at public.curoverse.com
Tue Feb 20 15:58:42 EST 2018
Summary of changes:
apps/workbench/Gemfile | 6 +-
apps/workbench/Gemfile.lock | 360 +++++++++++----------
apps/workbench/config/application.default.yml | 4 +-
.../config/environments/production.rb.example | 2 +-
apps/workbench/config/environments/test.rb.example | 4 +-
5 files changed, 198 insertions(+), 178 deletions(-)
via 39c3bbe1d5f1f20302bd09c0835f3963f8b627e6 (commit)
from 5a5ced3839f904c631f3bf54a56a7f8de064c118 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 39c3bbe1d5f1f20302bd09c0835f3963f8b627e6
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date: Tue Feb 20 17:57:46 2018 -0300
12737: Updates Workbench rails to version 4.2.7.1
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>
diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 788dcf6..87e3129 100644
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -4,13 +4,17 @@
source 'https://rubygems.org'
-gem 'rails', '~> 4.1'
+gem 'rails', '~> 4.2.7.1'
gem 'arvados', '>= 0.1.20150511150219'
gem 'activerecord-nulldb-adapter'
gem 'multi_json'
gem 'oj'
gem 'sass'
+gem 'mime-types', '~> 2.99'
+
+# Responders were extracted on rails 4.2
+gem 'responders', '~> 2.0'
# Note: keeping this out of the "group :assets" section "may" allow us
# to use Coffescript for UJS responses. It also prevents a
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 8ffc1d3..66b97b0 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -8,46 +8,55 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- RedCloth (4.2.9)
- actionmailer (4.1.12)
- actionpack (= 4.1.12)
- actionview (= 4.1.12)
+ RedCloth (4.3.2)
+ actionmailer (4.2.7.1)
+ actionpack (= 4.2.7.1)
+ actionview (= 4.2.7.1)
+ activejob (= 4.2.7.1)
mail (~> 2.5, >= 2.5.4)
- actionpack (4.1.12)
- actionview (= 4.1.12)
- activesupport (= 4.1.12)
- rack (~> 1.5.2)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ actionpack (4.2.7.1)
+ actionview (= 4.2.7.1)
+ activesupport (= 4.2.7.1)
+ rack (~> 1.6)
rack-test (~> 0.6.2)
- actionview (4.1.12)
- activesupport (= 4.1.12)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
+ actionview (4.2.7.1)
+ activesupport (= 4.2.7.1)
builder (~> 3.1)
erubis (~> 2.7.0)
- activemodel (4.1.12)
- activesupport (= 4.1.12)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
+ activejob (4.2.7.1)
+ activesupport (= 4.2.7.1)
+ globalid (>= 0.3.0)
+ activemodel (4.2.7.1)
+ activesupport (= 4.2.7.1)
builder (~> 3.1)
- activerecord (4.1.12)
- activemodel (= 4.1.12)
- activesupport (= 4.1.12)
- arel (~> 5.0.0)
- activerecord-nulldb-adapter (0.3.1)
+ activerecord (4.2.7.1)
+ activemodel (= 4.2.7.1)
+ activesupport (= 4.2.7.1)
+ arel (~> 6.0)
+ activerecord-nulldb-adapter (0.3.8)
activerecord (>= 2.0.0)
- activesupport (4.1.12)
- i18n (~> 0.6, >= 0.6.9)
+ activesupport (4.2.7.1)
+ i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
- thread_safe (~> 0.1)
+ thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
- addressable (2.4.0)
+ addressable (2.5.2)
+ public_suffix (>= 2.0.2, < 4.0)
andand (1.3.3)
- angularjs-rails (1.3.8)
- arel (5.0.1.20140414130214)
- arvados (0.1.20160420143004)
- activesupport (>= 3, < 4.2.6)
+ angularjs-rails (1.6.8)
+ arel (6.0.4)
+ arvados (0.1.20151207150126)
+ activesupport (>= 3.2.13)
andand (~> 1.3, >= 1.3.3)
- google-api-client (>= 0.7, < 0.9)
- i18n (~> 0)
+ google-api-client (~> 0.6.3, >= 0.6.3)
json (~> 1.7, >= 1.7.7)
- jwt (>= 0.1.5, < 2)
+ jwt (>= 0.1.5, < 1.0.0)
autoparse (0.3.3)
addressable (>= 2.3.1)
extlib (>= 0.9.15)
@@ -59,220 +68,223 @@ GEM
bootstrap-x-editable-rails (1.5.1.1)
railties (>= 3.0)
builder (3.2.3)
- byebug (3.5.1)
- columnize (~> 0.8)
- debugger-linecache (~> 1.2)
- slop (~> 3.6)
- capistrano (2.15.5)
+ byebug (10.0.0)
+ capistrano (2.15.9)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
- capybara (2.5.0)
- mime-types (>= 1.16)
+ capybara (2.18.0)
+ addressable
+ mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
- xpath (~> 2.0)
- childprocess (0.5.6)
+ xpath (>= 2.0, < 4.0)
+ childprocess (0.8.0)
ffi (~> 1.0, >= 1.0.11)
cliver (0.3.2)
- coffee-rails (4.1.0)
+ coffee-rails (4.2.2)
coffee-script (>= 2.2.0)
- railties (>= 4.0.0, < 5.0)
- coffee-script (2.3.0)
+ railties (>= 4.0.0)
+ coffee-script (2.4.1)
coffee-script-source
execjs
- coffee-script-source (1.8.0)
- columnize (0.9.0)
+ coffee-script-source (1.12.2)
commonjs (0.2.7)
concurrent-ruby (1.0.5)
- daemon_controller (1.2.0)
- debugger-linecache (1.2.0)
- deep_merge (1.0.1)
+ crass (1.0.3)
+ deep_merge (1.2.1)
docile (1.1.5)
erubis (2.7.0)
execjs (2.7.0)
extlib (0.9.16)
- faraday (0.9.2)
- multipart-post (>= 1.2, < 3)
- fast_stack (0.1.0)
- rake
- rake-compiler
- ffi (1.9.10)
- flamegraph (0.1.0)
- fast_stack
- google-api-client (0.8.6)
- activesupport (>= 3.2)
- addressable (~> 2.3)
- autoparse (~> 0.3)
- extlib (~> 0.9)
- faraday (~> 0.9)
- googleauth (~> 0.3)
- launchy (~> 2.4)
- multi_json (~> 1.10)
- retriable (~> 1.4)
- signet (~> 0.6)
- googleauth (0.5.1)
- faraday (~> 0.9)
- jwt (~> 1.4)
- logging (~> 2.0)
- memoist (~> 0.12)
- multi_json (~> 1.11)
- os (~> 0.9)
- signet (~> 0.7)
- headless (1.0.2)
- highline (1.6.21)
- httpclient (2.8.2.4)
- i18n (0.9.0)
+ faraday (0.8.11)
+ multipart-post (~> 1.2.0)
+ ffi (1.9.21)
+ flamegraph (0.9.5)
+ globalid (0.4.1)
+ activesupport (>= 4.2.0)
+ google-api-client (0.6.4)
+ addressable (>= 2.3.2)
+ autoparse (>= 0.3.3)
+ extlib (>= 0.9.15)
+ faraday (~> 0.8.4)
+ jwt (>= 0.1.5)
+ launchy (>= 2.1.1)
+ multi_json (>= 1.0.0)
+ signet (~> 0.4.5)
+ uuidtools (>= 2.1.0)
+ grease (0.3.1)
+ headless (2.3.1)
+ highline (1.7.10)
+ httpclient (2.8.3)
+ i18n (0.9.5)
concurrent-ruby (~> 1.0)
- jquery-rails (3.1.2)
- railties (>= 3.0, < 5.0)
+ jquery-rails (4.3.1)
+ rails-dom-testing (>= 1, < 3)
+ railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.6)
- jwt (1.5.4)
+ jwt (0.1.13)
+ multi_json (>= 1.5)
launchy (2.4.3)
addressable (~> 2.3)
less (2.6.0)
commonjs (~> 0.2.7)
- less-rails (2.6.0)
- actionpack (>= 3.1)
+ less-rails (3.0.0)
+ actionpack (>= 4.0)
+ grease
less (~> 2.6.0)
- libv8 (3.16.14.7)
- little-plugger (1.1.4)
- logging (2.1.0)
- little-plugger (~> 1.1)
- multi_json (~> 1.10)
- lograge (0.7.1)
- actionpack (>= 4, < 5.2)
- activesupport (>= 4, < 5.2)
- railties (>= 4, < 5.2)
+ sprockets (> 2, < 4)
+ tilt
+ libv8 (3.16.14.19)
+ lograge (0.9.0)
+ actionpack (>= 4)
+ activesupport (>= 4)
+ railties (>= 4)
request_store (~> 1.0)
logstash-event (1.2.02)
- mail (2.6.3)
- mime-types (>= 1.16, < 3)
- memoist (0.14.0)
+ loofah (2.2.0)
+ crass (~> 1.0.2)
+ nokogiri (>= 1.5.9)
+ mail (2.7.0)
+ mini_mime (>= 0.1.1)
metaclass (0.0.4)
- mime-types (2.99)
- mini_portile (0.6.2)
- minitest (5.10.3)
- mocha (1.1.0)
+ mime-types (2.99.3)
+ mini_mime (1.0.0)
+ mini_portile2 (2.3.0)
+ minitest (5.11.3)
+ mocha (1.3.0)
metaclass (~> 0.0.1)
- morrisjs-rails (0.5.1)
- railties (> 3.1, < 5)
- multi_json (1.12.1)
- multipart-post (2.0.0)
+ morrisjs-rails (0.5.1.2)
+ railties (> 3.1, < 6)
+ multi_json (1.13.1)
+ multipart-post (1.2.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
- net-ssh (2.9.2)
- net-ssh-gateway (1.2.0)
- net-ssh (>= 2.6.5)
- nokogiri (1.6.6.4)
- mini_portile (~> 0.6.0)
+ net-ssh (4.2.0)
+ net-ssh-gateway (2.0.0)
+ net-ssh (>= 4.0.0)
+ nokogiri (1.8.2)
+ mini_portile2 (~> 2.3.0)
npm-rails (0.2.1)
rails (>= 3.2)
- oj (2.11.2)
- os (0.9.6)
- passenger (4.0.57)
- daemon_controller (>= 1.2.0)
+ oj (3.4.0)
+ passenger (5.2.0)
rack
rake (>= 0.8.1)
piwik_analytics (1.0.2)
actionpack
activesupport
rails (>= 3.0.0)
- poltergeist (1.5.1)
+ poltergeist (1.17.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
- multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
- rack (1.5.5)
- rack-mini-profiler (0.9.2)
- rack (>= 1.1.3)
+ public_suffix (3.0.2)
+ rack (1.6.8)
+ rack-mini-profiler (0.10.7)
+ rack (>= 1.2.0)
rack-test (0.6.3)
rack (>= 1.0)
- rails (4.1.12)
- actionmailer (= 4.1.12)
- actionpack (= 4.1.12)
- actionview (= 4.1.12)
- activemodel (= 4.1.12)
- activerecord (= 4.1.12)
- activesupport (= 4.1.12)
+ rails (4.2.7.1)
+ actionmailer (= 4.2.7.1)
+ actionpack (= 4.2.7.1)
+ actionview (= 4.2.7.1)
+ activejob (= 4.2.7.1)
+ activemodel (= 4.2.7.1)
+ activerecord (= 4.2.7.1)
+ activesupport (= 4.2.7.1)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.1.12)
- sprockets-rails (~> 2.0)
- rails-perftest (0.0.5)
- railties (4.1.12)
- actionpack (= 4.1.12)
- activesupport (= 4.1.12)
+ railties (= 4.2.7.1)
+ sprockets-rails
+ rails-deprecated_sanitizer (1.0.3)
+ activesupport (>= 4.2.0.alpha)
+ rails-dom-testing (1.0.9)
+ activesupport (>= 4.2.0, < 5.0)
+ nokogiri (~> 1.6)
+ rails-deprecated_sanitizer (>= 1.0.1)
+ rails-html-sanitizer (1.0.3)
+ loofah (~> 2.0)
+ rails-perftest (0.0.7)
+ railties (4.2.7.1)
+ actionpack (= 4.2.7.1)
+ activesupport (= 4.2.7.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- rake (12.2.1)
- rake-compiler (0.9.5)
- rake
+ rake (12.3.0)
raphael-rails (2.1.2)
- ref (1.0.5)
- request_store (1.3.2)
- retriable (1.4.1)
+ rb-fsevent (0.10.2)
+ rb-inotify (0.9.10)
+ ffi (>= 0.5.0, < 2)
+ ref (2.0.0)
+ request_store (1.4.0)
+ rack (>= 1.4)
+ responders (2.4.0)
+ actionpack (>= 4.2.0, < 5.3)
+ railties (>= 4.2.0, < 5.3)
ruby-debug-passenger (0.2.0)
- ruby-prof (0.15.2)
- rubyzip (1.1.7)
- rvm-capistrano (1.5.5)
+ ruby-prof (0.17.0)
+ rubyzip (1.2.1)
+ rvm-capistrano (1.5.6)
capistrano (~> 2.15.4)
safe_yaml (1.0.4)
- sass (3.4.9)
- sass-rails (5.0.1)
- railties (>= 4.0.0, < 5.0)
+ sass (3.5.5)
+ sass-listen (~> 4.0.0)
+ sass-listen (4.0.0)
+ rb-fsevent (~> 0.9, >= 0.9.4)
+ rb-inotify (~> 0.9, >= 0.9.7)
+ sass-rails (5.0.7)
+ railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
- tilt (~> 1.1)
- selenium-webdriver (2.53.1)
+ tilt (>= 1.1, < 3)
+ selenium-webdriver (3.9.0)
childprocess (~> 0.5)
- multi_json (~> 1.0)
- rubyzip (~> 1.0)
- websocket (~> 1.0)
- signet (0.7.2)
- addressable (~> 2.3)
- faraday (~> 0.9)
- jwt (~> 1.5)
- multi_json (~> 1.10)
- simplecov (0.9.1)
+ rubyzip (~> 1.2)
+ signet (0.4.5)
+ addressable (>= 2.2.3)
+ faraday (~> 0.8.1)
+ jwt (>= 0.1.5)
+ multi_json (>= 1.0.0)
+ simplecov (0.15.1)
docile (~> 1.1.0)
- multi_json (~> 1.0)
- simplecov-html (~> 0.8.0)
- simplecov-html (0.8.0)
+ json (>= 1.8, < 3)
+ simplecov-html (~> 0.10.0)
+ simplecov-html (0.10.2)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
- slop (3.6.0)
- sprockets (3.2.0)
- rack (~> 1.0)
- sprockets-rails (2.3.2)
- actionpack (>= 3.0)
- activesupport (>= 3.0)
- sprockets (>= 2.8, < 4.0)
- sshkey (1.6.1)
- therubyracer (0.12.1)
- libv8 (~> 3.16.14.0)
+ sprockets (3.7.1)
+ concurrent-ruby (~> 1.0)
+ rack (> 1, < 3)
+ sprockets-rails (3.2.1)
+ actionpack (>= 4.0)
+ activesupport (>= 4.0)
+ sprockets (>= 3.0.0)
+ sshkey (1.9.0)
+ therubyracer (0.12.3)
+ libv8 (~> 3.16.14.15)
ref
thor (0.20.0)
thread_safe (0.3.6)
- tilt (1.4.1)
- tzinfo (1.2.4)
+ tilt (2.0.8)
+ tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
- websocket (1.2.2)
- websocket-driver (0.5.1)
+ uuidtools (2.1.5)
+ websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
- websocket-extensions (0.1.1)
+ websocket-extensions (0.1.3)
wiselinks (1.2.1)
- xpath (2.0.0)
- nokogiri (~> 1.3)
+ xpath (3.0.0)
+ nokogiri (~> 1.8)
PLATFORMS
ruby
@@ -298,6 +310,7 @@ DEPENDENCIES
less-rails
lograge
logstash-event
+ mime-types (~> 2.99)
minitest (~> 5.0)
mocha
morrisjs-rails
@@ -308,9 +321,10 @@ DEPENDENCIES
piwik_analytics
poltergeist
rack-mini-profiler
- rails (~> 4.1)
+ rails (~> 4.2.7.1)
rails-perftest
raphael-rails
+ responders (~> 2.0)
ruby-debug-passenger
ruby-prof
rvm-capistrano
@@ -327,4 +341,4 @@ DEPENDENCIES
wiselinks
BUNDLED WITH
- 1.16.0
+ 1.16.1
diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 76f7a30..248daa1 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -66,7 +66,7 @@ production:
eager_load: true
consider_all_requests_local: false
action_controller.perform_caching: true
- serve_static_assets: false
+ serve_static_files: false
assets.compile: false
assets.digest: true
i18n.fallbacks: true
@@ -88,7 +88,7 @@ production:
test:
cache_classes: true
eager_load: false
- serve_static_assets: true
+ serve_static_files: true
static_cache_control: public, max-age=3600
consider_all_requests_local: true
action_controller.perform_caching: false
diff --git a/apps/workbench/config/environments/production.rb.example b/apps/workbench/config/environments/production.rb.example
index cc88886..8b656c5 100644
--- a/apps/workbench/config/environments/production.rb.example
+++ b/apps/workbench/config/environments/production.rb.example
@@ -13,7 +13,7 @@ ArvadosWorkbench::Application.configure do
config.action_controller.perform_caching = true
# Disable Rails's static asset server (Apache or nginx will already do this)
- config.serve_static_assets = false
+ config.serve_static_files = false
# Compress JavaScripts and CSS
config.assets.js_compressor = :uglifier
diff --git a/apps/workbench/config/environments/test.rb.example b/apps/workbench/config/environments/test.rb.example
index 1c79020..978a14c 100644
--- a/apps/workbench/config/environments/test.rb.example
+++ b/apps/workbench/config/environments/test.rb.example
@@ -12,7 +12,7 @@ ArvadosWorkbench::Application.configure do
config.cache_classes = true
# Configure static asset server for tests with Cache-Control for performance
- config.serve_static_assets = true
+ config.serve_static_files = true
config.static_cache_control = "public, max-age=3600"
# Show full error reports and disable caching
@@ -36,4 +36,6 @@ ArvadosWorkbench::Application.configure do
# Log timing data for API transactions
config.profiling_enabled = false
+ # This will change to :random on Rails 5
+ config.active_support.test_order = :sorted
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list