projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '1530-arv-tag-commands'
[arvados.git]
/
apps
/
workbench
/
Gemfile.lock
diff --git
a/apps/workbench/Gemfile.lock
b/apps/workbench/Gemfile.lock
index 56cbadc2e4319315046b18a9e1b843583233c897..5e53ef1cc472613391a776acdf44024207f76a50 100644
(file)
--- a/
apps/workbench/Gemfile.lock
+++ b/
apps/workbench/Gemfile.lock
@@
-30,7
+30,7
@@
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
)
+ anjlab-bootstrap-rails (
2.3.1.2
)
railties (>= 3.0)
sass (>= 3.2)
arel (3.0.2)
railties (>= 3.0)
sass (>= 3.2)
arel (3.0.2)
@@
-56,6
+56,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)
@@
-129,6
+130,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
@@
-153,9
+156,10
@@
PLATFORMS
DEPENDENCIES
RedCloth
andand
DEPENDENCIES
RedCloth
andand
- anjlab-bootstrap-rails (
>= 2.2
)
+ anjlab-bootstrap-rails (
~> 2.3
)
bootstrap-editable-rails
coffee-rails (~> 3.2.0)
bootstrap-editable-rails
coffee-rails (~> 3.2.0)
+ httpclient
jquery-rails
less
less-rails
jquery-rails
less
less-rails
@@
-168,6
+172,7
@@
DEPENDENCIES
sass
sass-rails (~> 3.2.0)
sqlite3
sass
sass-rails (~> 3.2.0)
sqlite3
+ themes_for_rails
therubyracer
twitter-bootstrap-rails
uglifier (>= 1.0.3)
therubyracer
twitter-bootstrap-rails
uglifier (>= 1.0.3)