projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2221-complete-docker
[arvados.git]
/
apps
/
workbench
/
Gemfile.lock
diff --git
a/apps/workbench/Gemfile.lock
b/apps/workbench/Gemfile.lock
index def96dba5cf79275ac2adea2a0e1b482e050366c..7f4dc8e289150c38165528556f504eb6372dfe4f 100644
(file)
--- a/
apps/workbench/Gemfile.lock
+++ b/
apps/workbench/Gemfile.lock
@@
-30,12
+30,11
@@
GEM
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
andand (1.3.3)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
andand (1.3.3)
- anjlab-bootstrap-rails (3.0.2.0)
- railties (>= 3.0)
- sass (>= 3.2)
arel (3.0.2)
arel (3.0.2)
- bootstrap-editable-rails (0.0.5)
- railties (>= 3.1)
+ bootstrap-sass (3.1.0.1)
+ sass (~> 3.2)
+ bootstrap-x-editable-rails (1.5.1.1)
+ railties (>= 3.0)
builder (3.0.4)
capistrano (2.15.5)
highline
builder (3.0.4)
capistrano (2.15.5)
highline
@@
-56,6
+55,7
@@
GEM
execjs (2.0.2)
highline (1.6.20)
hike (1.2.3)
execjs (2.0.2)
highline (1.6.20)
hike (1.2.3)
+ httpclient (2.3.4.1)
i18n (0.6.5)
journey (1.0.4)
jquery-rails (3.0.4)
i18n (0.6.5)
journey (1.0.4)
jquery-rails (3.0.4)
@@
-85,7
+85,6
@@
GEM
daemon_controller (>= 1.1.0)
rack
rake (>= 0.8.1)
daemon_controller (>= 1.1.0)
rack
rake (>= 0.8.1)
- pg (0.17.0)
piwik_analytics (1.0.2)
actionpack
activesupport
piwik_analytics (1.0.2)
actionpack
activesupport
@@
-130,6
+129,8
@@
GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.8)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.8)
+ themes_for_rails (0.5.1)
+ rails (>= 3.0.0)
therubyracer (0.12.0)
libv8 (~> 3.16.14.0)
ref
therubyracer (0.12.0)
libv8 (~> 3.16.14.0)
ref
@@
-138,11
+139,6
@@
GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
- twitter-bootstrap-rails (2.2.8)
- actionpack (>= 3.1)
- execjs
- rails (>= 3.1)
- railties (>= 3.1)
tzinfo (0.3.38)
uglifier (2.3.1)
execjs (>= 0.3.0)
tzinfo (0.3.38)
uglifier (2.3.1)
execjs (>= 0.3.0)
@@
-154,21
+150,22
@@
PLATFORMS
DEPENDENCIES
RedCloth
andand
DEPENDENCIES
RedCloth
andand
-
anjlab-bootstrap-rails (>= 2.2
)
- bootstrap-editable-rails
+
bootstrap-sass (~> 3.1.0
)
+ bootstrap-
x-
editable-rails
coffee-rails (~> 3.2.0)
coffee-rails (~> 3.2.0)
+ httpclient
jquery-rails
less
less-rails
multi_json
oj
passenger
jquery-rails
less
less-rails
multi_json
oj
passenger
- pg
piwik_analytics
rails (~> 3.2.0)
rvm-capistrano
piwik_analytics
rails (~> 3.2.0)
rvm-capistrano
+ sass
sass-rails (~> 3.2.0)
sqlite3
sass-rails (~> 3.2.0)
sqlite3
+ themes_for_rails
therubyracer
therubyracer
- twitter-bootstrap-rails
uglifier (>= 1.0.3)
uglifier (>= 1.0.3)