[ARVADOS] created: e06a7fe89b49ad13f7a3153006be06d89f382693

[git at public.curoverse.com]

        at  e06a7fe89b49ad13f7a3153006be06d89f382693 (commit)


commit e06a7fe89b49ad13f7a3153006be06d89f382693
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Jul 14 13:49:51 2015 -0400

    6362: Update bootstrap gem.

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index e35cc83..9c874e2 100644
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -53,7 +53,8 @@ group :test, :performance do
 end
 
 gem 'jquery-rails'
-gem 'bootstrap-sass', '~> 3.1.0'
+gem 'sprockets-rails'
+gem 'bootstrap-sass', '~> 3.3.0'
 gem 'bootstrap-x-editable-rails'
 gem 'bootstrap-tab-history-rails'
 
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index bc7ddaf..5994359 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -51,8 +51,12 @@ GEM
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
-    bootstrap-sass (3.1.1.1)
-      sass (~> 3.2)
+    autoprefixer-rails (5.2.1)
+      execjs
+      json
+    bootstrap-sass (3.3.5.1)
+      autoprefixer-rails (>= 5.0.0.1)
+      sass (>= 3.3.0)
     bootstrap-tab-history-rails (0.1.0)
       railties (>= 3.1)
     bootstrap-x-editable-rails (1.5.1.1)
@@ -256,7 +260,7 @@ DEPENDENCIES
   andand
   angularjs-rails
   arvados (>= 0.1.20150511150219)
-  bootstrap-sass (~> 3.1.0)
+  bootstrap-sass (~> 3.3.0)
   bootstrap-tab-history-rails
   bootstrap-x-editable-rails
   byebug
@@ -289,6 +293,7 @@ DEPENDENCIES
   selenium-webdriver
   simplecov (~> 0.7)
   simplecov-rcov
+  sprockets-rails
   sshkey
   themes_for_rails!
   therubyracer
diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index 9560bb7..bab7289 100644
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -7,14 +7,15 @@
  *
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require bootstrap
- *= require bootstrap3-editable/bootstrap-editable
- *= require morris
- *= require_tree .
  */
 
+ at import 'bootstrap-sprockets';
+ at import 'bootstrap';
+ at import 'bootstrap3-editable/bootstrap-editable';
+
+//= require morris
+//= require_tree .
+
 .contain-align-left {
     text-align: left;
 }

commit 949e783165d16b53f2c19c83c921e5cc8af96873
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Jul 14 13:49:15 2015 -0400

    6362: Change config precedence order.
    
    Before: environments/*.rb, Rails defaults, application.yml,
    application.default.yml.
    
    After: application.yml, application.default.yml, environments/*.rb,
    Rails defaults.
    
    This makes it possible to use application*.yml to control configs that
    have Rails defaults. (application.default.yml file has had such
    configs for ages, like assets.digest, but they have never been
    effective.)

diff --git a/apps/workbench/config/load_config.rb b/apps/workbench/config/load_config.rb
index 51fc81a..f14c3ca 100644
--- a/apps/workbench/config/load_config.rb
+++ b/apps/workbench/config/load_config.rb
@@ -23,11 +23,17 @@ ArvadosWorkbench::Application.configure do
     ks.each do |kk|
       cfg = cfg.send(kk)
     end
-    if cfg.respond_to?(k.to_sym) and !cfg.send(k).nil?
-      # Config must have been set already in environments/*.rb.
+    if v.nil? and cfg.respond_to?(k) and !cfg.send(k).nil?
+      # Config is nil in *.yml, but has been set already in
+      # environments/*.rb (or has a Rails default). Don't overwrite
+      # the default/upstream config with nil.
       #
       # After config files have been migrated, this mechanism should
-      # be deprecated, then removed.
+      # be removed.
+      Rails.logger.warn <<EOS
+DEPRECATED: Inheriting config.#{ks.join '.'} from Rails config.
+            Please move this config into config/application.yml.
+EOS
     elsif v.nil?
       # Config variables are not allowed to be nil. Make a "naughty"
       # list, and present it below.

-----------------------------------------------------------------------


hooks/post-receive
--