projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3408-production-datamanager
[arvados.git]
/
apps
/
workbench
/
Gemfile.lock
diff --git
a/apps/workbench/Gemfile.lock
b/apps/workbench/Gemfile.lock
index 0d9324f58854f5e9811b155ad7695aebc19f7c43..9a886972a1a256b1b09df90e841810d42d00bdd1 100644
(file)
--- a/
apps/workbench/Gemfile.lock
+++ b/
apps/workbench/Gemfile.lock
@@
-40,7
+40,7
@@
GEM
andand (1.3.3)
angularjs-rails (1.3.8)
arel (5.0.1.20140414130214)
andand (1.3.3)
angularjs-rails (1.3.8)
arel (5.0.1.20140414130214)
- arvados (0.1.201502
09223441
)
+ arvados (0.1.201502
10011250
)
activesupport (>= 3.2.13)
andand (~> 1.3, >= 1.3.3)
google-api-client (~> 0.6.3, >= 0.6.3)
activesupport (>= 3.2.13)
andand (~> 1.3, >= 1.3.3)
google-api-client (~> 0.6.3, >= 0.6.3)
@@
-258,7
+258,7
@@
DEPENDENCIES
RedCloth
andand
angularjs-rails
RedCloth
andand
angularjs-rails
- arvados (>= 0.1.201502
09223441
)
+ arvados (>= 0.1.201502
10011250
)
bootstrap-sass (~> 3.1.0)
bootstrap-tab-history-rails
bootstrap-x-editable-rails
bootstrap-sass (~> 3.1.0)
bootstrap-tab-history-rails
bootstrap-x-editable-rails