projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3661-copy-move-from-show
[arvados.git]
/
apps
/
workbench
/
Gemfile.lock
diff --git
a/apps/workbench/Gemfile.lock
b/apps/workbench/Gemfile.lock
index f0e20f13b305c5cc1af9790128de7387f8c46d39..bdf39138819841d4cded1766eb49f70500c56599 100644
(file)
--- a/
apps/workbench/Gemfile.lock
+++ b/
apps/workbench/Gemfile.lock
@@
-39,7
+39,7
@@
GEM
addressable (2.3.6)
andand (1.3.3)
arel (5.0.1.20140414130214)
addressable (2.3.6)
andand (1.3.3)
arel (5.0.1.20140414130214)
- arvados (0.1.201409
05115707
)
+ arvados (0.1.201409
17180103
)
activesupport (>= 3.2.13)
andand
google-api-client (~> 0.6.3)
activesupport (>= 3.2.13)
andand
google-api-client (~> 0.6.3)
@@
-229,7
+229,7
@@
PLATFORMS
DEPENDENCIES
RedCloth
andand
DEPENDENCIES
RedCloth
andand
- arvados (>= 0.1.201409
05115707
)
+ arvados (>= 0.1.201409
17180103
)
bootstrap-sass (~> 3.1.0)
bootstrap-x-editable-rails
capybara
bootstrap-sass (~> 3.1.0)
bootstrap-x-editable-rails
capybara