[ARVADOS] updated: 706f34d335cecb9f321dda8abaf8718fa951e908

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/Gemfile                                     |  3 +--
 apps/workbench/Gemfile.lock                                | 11 +++--------
 apps/workbench/app/assets/stylesheets/application.css.scss | 13 ++++++-------
 3 files changed, 10 insertions(+), 17 deletions(-)

       via  706f34d335cecb9f321dda8abaf8718fa951e908 (commit)
      from  9ac57b0bc6cb5d90da57c943df489401c63b7a7f (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 706f34d335cecb9f321dda8abaf8718fa951e908
Author: Tom Clegg <tom at curoverse.com>
Date:   Sat Jul 18 02:34:21 2015 -0400

    Revert "6362: Update bootstrap gem."
    
    This reverts commit ed8897b942f147afccf8eeac1025861ffe2f1690.
    
    refs #6362

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 9c874e2..e35cc83 100644
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -53,8 +53,7 @@ group :test, :performance do
 end
 
 gem 'jquery-rails'
-gem 'sprockets-rails'
-gem 'bootstrap-sass', '~> 3.3.0'
+gem 'bootstrap-sass', '~> 3.1.0'
 gem 'bootstrap-x-editable-rails'
 gem 'bootstrap-tab-history-rails'
 
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 5994359..bc7ddaf 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -51,12 +51,8 @@ GEM
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
-    autoprefixer-rails (5.2.1)
-      execjs
-      json
-    bootstrap-sass (3.3.5.1)
-      autoprefixer-rails (>= 5.0.0.1)
-      sass (>= 3.3.0)
+    bootstrap-sass (3.1.1.1)
+      sass (~> 3.2)
     bootstrap-tab-history-rails (0.1.0)
       railties (>= 3.1)
     bootstrap-x-editable-rails (1.5.1.1)
@@ -260,7 +256,7 @@ DEPENDENCIES
   andand
   angularjs-rails
   arvados (>= 0.1.20150511150219)
-  bootstrap-sass (~> 3.3.0)
+  bootstrap-sass (~> 3.1.0)
   bootstrap-tab-history-rails
   bootstrap-x-editable-rails
   byebug
@@ -293,7 +289,6 @@ 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 bab7289..9560bb7 100644
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -7,15 +7,14 @@
  *
  * 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
--