projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '12662-multisite-add-broken'
[arvados.git]
/
apps
/
workbench
/
Gemfile.lock
diff --git
a/apps/workbench/Gemfile.lock
b/apps/workbench/Gemfile.lock
index 34db9cd71c9ef61187b8593a111e76fa410538ea..8ffc1d33b50c8175fe3804f281390dc09f67d2f8 100644
(file)
--- a/
apps/workbench/Gemfile.lock
+++ b/
apps/workbench/Gemfile.lock
@@
-58,7
+58,7
@@
GEM
railties (>= 3.1)
bootstrap-x-editable-rails (1.5.1.1)
railties (>= 3.0)
railties (>= 3.1)
bootstrap-x-editable-rails (1.5.1.1)
railties (>= 3.0)
- builder (3.2.
2
)
+ builder (3.2.
3
)
byebug (3.5.1)
columnize (~> 0.8)
debugger-linecache (~> 1.2)
byebug (3.5.1)
columnize (~> 0.8)
debugger-linecache (~> 1.2)
@@
-87,6
+87,7
@@
GEM
coffee-script-source (1.8.0)
columnize (0.9.0)
commonjs (0.2.7)
coffee-script-source (1.8.0)
columnize (0.9.0)
commonjs (0.2.7)
+ concurrent-ruby (1.0.5)
daemon_controller (1.2.0)
debugger-linecache (1.2.0)
deep_merge (1.0.1)
daemon_controller (1.2.0)
debugger-linecache (1.2.0)
deep_merge (1.0.1)
@@
-124,11
+125,12
@@
GEM
headless (1.0.2)
highline (1.6.21)
httpclient (2.8.2.4)
headless (1.0.2)
highline (1.6.21)
httpclient (2.8.2.4)
- i18n (0.7.0)
+ i18n (0.9.0)
+ concurrent-ruby (~> 1.0)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.8.
3
)
+ json (1.8.
6
)
jwt (1.5.4)
launchy (2.4.3)
addressable (~> 2.3)
jwt (1.5.4)
launchy (2.4.3)
addressable (~> 2.3)
@@
-142,10
+144,11
@@
GEM
logging (2.1.0)
little-plugger (~> 1.1)
multi_json (~> 1.10)
logging (2.1.0)
little-plugger (~> 1.1)
multi_json (~> 1.10)
- lograge (0.3.6)
- actionpack (>= 3)
- activesupport (>= 3)
- railties (>= 3)
+ lograge (0.7.1)
+ actionpack (>= 4, < 5.2)
+ activesupport (>= 4, < 5.2)
+ railties (>= 4, < 5.2)
+ request_store (~> 1.0)
logstash-event (1.2.02)
mail (2.6.3)
mime-types (>= 1.16, < 3)
logstash-event (1.2.02)
mail (2.6.3)
mime-types (>= 1.16, < 3)
@@
-153,7
+156,7
@@
GEM
metaclass (0.0.4)
mime-types (2.99)
mini_portile (0.6.2)
metaclass (0.0.4)
mime-types (2.99)
mini_portile (0.6.2)
- minitest (5.
8.4
)
+ minitest (5.
10.3
)
mocha (1.1.0)
metaclass (~> 0.0.1)
morrisjs-rails (0.5.1)
mocha (1.1.0)
metaclass (~> 0.0.1)
morrisjs-rails (0.5.1)
@@
-207,11
+210,12
@@
GEM
activesupport (= 4.1.12)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
activesupport (= 4.1.12)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- rake (1
0.4.2
)
+ rake (1
2.2.1
)
rake-compiler (0.9.5)
rake
raphael-rails (2.1.2)
ref (1.0.5)
rake-compiler (0.9.5)
rake
raphael-rails (2.1.2)
ref (1.0.5)
+ request_store (1.3.2)
retriable (1.4.1)
ruby-debug-passenger (0.2.0)
ruby-prof (0.15.2)
retriable (1.4.1)
ruby-debug-passenger (0.2.0)
ruby-prof (0.15.2)
@@
-254,10
+258,10
@@
GEM
therubyracer (0.12.1)
libv8 (~> 3.16.14.0)
ref
therubyracer (0.12.1)
libv8 (~> 3.16.14.0)
ref
- thor (0.
19.1
)
- thread_safe (0.3.
5
)
+ thor (0.
20.0
)
+ thread_safe (0.3.
6
)
tilt (1.4.1)
tilt (1.4.1)
- tzinfo (1.2.
2
)
+ tzinfo (1.2.
4
)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
@@
-323,4
+327,4
@@
DEPENDENCIES
wiselinks
BUNDLED WITH
wiselinks
BUNDLED WITH
- 1.1
5.1
+ 1.1
6.0