projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improvements and bugfixes refs #2242.
[arvados.git]
/
apps
/
workbench
/
Gemfile.lock
diff --git
a/apps/workbench/Gemfile.lock
b/apps/workbench/Gemfile.lock
index 5e53ef1cc472613391a776acdf44024207f76a50..c7ffeb00574af4be2d89aa22589e555bd02e75ff 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 (2.3.1.2)
- 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
@@
-52,6
+51,7
@@
GEM
coffee-script-source (1.6.3)
commonjs (0.2.7)
daemon_controller (1.1.7)
coffee-script-source (1.6.3)
commonjs (0.2.7)
daemon_controller (1.1.7)
+ deep_merge (1.0.1)
erubis (2.7.0)
execjs (2.0.2)
highline (1.6.20)
erubis (2.7.0)
execjs (2.0.2)
highline (1.6.20)
@@
-140,11
+140,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)
@@
-156,9
+151,10
@@
PLATFORMS
DEPENDENCIES
RedCloth
andand
DEPENDENCIES
RedCloth
andand
-
anjlab-bootstrap-rails (~> 2.3
)
- bootstrap-editable-rails
+
bootstrap-sass (~> 3.1.0
)
+ bootstrap-
x-
editable-rails
coffee-rails (~> 3.2.0)
coffee-rails (~> 3.2.0)
+ deep_merge
httpclient
jquery-rails
less
httpclient
jquery-rails
less
@@
-174,5
+170,4
@@
DEPENDENCIES
sqlite3
themes_for_rails
therubyracer
sqlite3
themes_for_rails
therubyracer
- twitter-bootstrap-rails
uglifier (>= 1.0.3)
uglifier (>= 1.0.3)