[ARVADOS] updated: ed8897b942f147afccf8eeac1025861ffe2f1690

[git at public.curoverse.com]

Summary of changes:

  discards  0af57aeb8478b0cf0c54c99788e7c72d89d0fa5f (commit)
       via  ed8897b942f147afccf8eeac1025861ffe2f1690 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (0af57aeb8478b0cf0c54c99788e7c72d89d0fa5f)
            \
             N -- N -- N (ed8897b942f147afccf8eeac1025861ffe2f1690)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 ed8897b942f147afccf8eeac1025861ffe2f1690
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Jul 14 13:49:51 2015 -0400

    6362: Update bootstrap gem.
    
    See https://github.com/twbs/bootstrap-sass/issues/653

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;
 }

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


hooks/post-receive
--