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 2618e47cbf606dbf59ab7ef63d2833e60553c020..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,12
+87,13
@@
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)
docile (1.1.5)
erubis (2.7.0)
daemon_controller (1.2.0)
debugger-linecache (1.2.0)
deep_merge (1.0.1)
docile (1.1.5)
erubis (2.7.0)
- execjs (2.
2.2
)
+ execjs (2.
7.0
)
extlib (0.9.16)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
extlib (0.9.16)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
@@
-123,12
+124,13
@@
GEM
signet (~> 0.7)
headless (1.0.2)
highline (1.6.21)
signet (~> 0.7)
headless (1.0.2)
highline (1.6.21)
- httpclient (2.6.0.1)
- i18n (0.7.0)
+ httpclient (2.8.2.4)
+ 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,18
+144,24
@@
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.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)
memoist (0.14.0)
metaclass (0.0.4)
mime-types (2.99)
mini_portile (0.6.2)
mail (2.6.3)
mime-types (>= 1.16, < 3)
memoist (0.14.0)
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)
railties (> 3.1, < 5)
mocha (1.1.0)
metaclass (~> 0.0.1)
morrisjs-rails (0.5.1)
railties (> 3.1, < 5)
- multi_json (1.12.
0
)
+ multi_json (1.12.
1
)
multipart-post (2.0.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
multipart-post (2.0.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
@@
-164,6
+172,8
@@
GEM
net-ssh (>= 2.6.5)
nokogiri (1.6.6.4)
mini_portile (~> 0.6.0)
net-ssh (>= 2.6.5)
nokogiri (1.6.6.4)
mini_portile (~> 0.6.0)
+ npm-rails (0.2.1)
+ rails (>= 3.2)
oj (2.11.2)
os (0.9.6)
passenger (4.0.57)
oj (2.11.2)
os (0.9.6)
passenger (4.0.57)
@@
-200,17
+210,19
@@
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)
rubyzip (1.1.7)
rvm-capistrano (1.5.5)
capistrano (~> 2.15.4)
retriable (1.4.1)
ruby-debug-passenger (0.2.0)
ruby-prof (0.15.2)
rubyzip (1.1.7)
rvm-capistrano (1.5.5)
capistrano (~> 2.15.4)
+ safe_yaml (1.0.4)
sass (3.4.9)
sass-rails (5.0.1)
railties (>= 4.0.0, < 5.0)
sass (3.4.9)
sass-rails (5.0.1)
railties (>= 4.0.0, < 5.0)
@@
-246,12
+258,12
@@
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)
thread_safe (~> 0.1)
- uglifier (2.7.
0
)
+ uglifier (2.7.
2
)
execjs (>= 0.3.0)
json (>= 1.8.0)
websocket (1.2.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
websocket (1.2.2)
@@
-284,21
+296,25
@@
DEPENDENCIES
jquery-rails
less
less-rails
jquery-rails
less
less-rails
- minitest (>= 5.0.0)
+ lograge
+ logstash-event
+ minitest (~> 5.0)
mocha
morrisjs-rails
multi_json
mocha
morrisjs-rails
multi_json
+ npm-rails
oj
passenger
piwik_analytics
poltergeist
rack-mini-profiler
oj
passenger
piwik_analytics
poltergeist
rack-mini-profiler
- rails (~> 4.1
.0
)
+ rails (~> 4.1)
rails-perftest
raphael-rails
ruby-debug-passenger
ruby-prof
rvm-capistrano
rails-perftest
raphael-rails
ruby-debug-passenger
ruby-prof
rvm-capistrano
+ safe_yaml
sass
sass-rails
selenium-webdriver
sass
sass-rails
selenium-webdriver
@@
-307,5
+323,8
@@
DEPENDENCIES
sshkey
themes_for_rails!
therubyracer
sshkey
themes_for_rails!
therubyracer
- uglifier (
>= 1.0.3
)
+ uglifier (
~> 2.0
)
wiselinks
wiselinks
+
+BUNDLED WITH
+ 1.16.0