Skip to content

Commit

Permalink
Updated gems.
Browse files Browse the repository at this point in the history
  • Loading branch information
@martini
martini committed Jul 16, 2016
1 parent 5bbb249 commit 5e28c50
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 53 deletions.
50 changes: 27 additions & 23 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ GEM
addressable (2.4.0)
arel (6.0.3)
ast (2.3.0)
autoprefixer-rails (6.3.6.2)
autoprefixer-rails (6.3.7)
execjs
biz (1.6.0)
clavius (~> 1.0)
Expand Down Expand Up @@ -98,7 +98,7 @@ GEM
execjs (2.7.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.10)
ffi (1.9.14)
formatador (0.2.5)
globalid (0.3.6)
activesupport (>= 4.1.0)
Expand Down Expand Up @@ -129,14 +129,14 @@ GEM
http-form_data (1.0.1)
http_parser.rb (0.6.0)
i18n (0.7.0)
icalendar (2.3.0)
icalendar (2.4.0)
inflection (1.0.0)
json (1.8.3)
jwt (1.5.1)
koala (2.3.0)
jwt (1.5.4)
koala (2.4.0)
addressable
faraday
multi_json
multi_json (>= 1.3.0)
libv8 (3.16.14.15)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand All @@ -150,7 +150,9 @@ GEM
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.8.2)
mime-types (2.99.2)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.9.0)
multi_json (1.12.1)
Expand All @@ -160,17 +162,17 @@ GEM
naught (1.1.0)
nenv (0.3.0)
nestful (1.1.1)
net-ldap (0.14.0)
net-ldap (0.15.0)
nokogiri (1.6.8)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
notiffany (0.1.0)
nenv (~> 0.1)
shellany (~> 0.0)
oauth (0.5.1)
oauth2 (1.1.0)
oauth2 (1.2.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0, < 1.5.2)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
Expand All @@ -179,8 +181,8 @@ GEM
rack (>= 1.0, < 3)
omniauth-facebook (3.0.0)
omniauth-oauth2 (~> 1.2)
omniauth-google-oauth2 (0.4.0)
jwt (~> 1.5.0)
omniauth-google-oauth2 (0.4.1)
jwt (~> 1.5.2)
multi_json (~> 1.3)
omniauth (>= 1.1.1)
omniauth-oauth2 (>= 1.3.1)
Expand All @@ -197,14 +199,15 @@ GEM
omniauth-oauth (~> 1.1)
parser (2.3.1.2)
ast (~> 2.2)
pg (0.18.4)
phony (2.15.26)
pkg-config (1.1.7)
pluginator (1.3.0)
power_assert (0.3.0)
powerpack (0.1.1)
pre-commit (0.27.0)
pre-commit (0.28.0)
pluginator (~> 1.1)
pry (0.10.3)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
Expand Down Expand Up @@ -246,7 +249,7 @@ GEM
rb-inotify (0.9.7)
ffi (>= 0.5.0)
ref (2.0.0)
rubocop (0.41.1)
rubocop (0.41.2)
parser (>= 2.3.1.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
Expand All @@ -256,8 +259,8 @@ GEM
ruby_dep (1.3.1)
rubyzip (1.2.0)
sass (3.4.22)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass-rails (5.0.5)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
Expand All @@ -270,17 +273,17 @@ GEM
shellany (0.0.1)
simple-rss (1.3.1)
simple_oauth (0.3.1)
simplecov (0.11.2)
simplecov (0.12.0)
docile (~> 1.1.0)
json (~> 1.8)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
slack-notifier (1.5.1)
slop (3.6.0)
spring (1.7.1)
sprockets (3.6.2)
spring (1.7.2)
sprockets (3.6.3)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.1.1)
Expand Down Expand Up @@ -317,11 +320,11 @@ GEM
unicode-display_width (1.1.0)
websocket (1.2.3)
writeexcel (1.0.5)
zendesk_api (1.13.4)
zendesk_api (1.14.0)
faraday (~> 0.9)
hashie (>= 1.2, < 4.0, != 3.3.0)
inflection
mime-types (~> 2.99)
mime-types
multipart-post (~> 2.0)
scrub_rb (~> 1.0.1)

Expand Down Expand Up @@ -361,6 +364,7 @@ DEPENDENCIES
omniauth-google-oauth2
omniauth-linkedin
omniauth-twitter
pg
phony
pre-commit
puma
Expand Down
60 changes: 30 additions & 30 deletions LICENSE-3RD-PARTY.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,16 @@ Source: https://github.com/exif-js/exif-js
Copyright: Jacob Seidelin, Roald de Vries
License: MIT license
-----------------------------------------------------------------------------
jquery.flot.js
Source: https://github.com/dnschnur/flot
Copyright: Ole Laursen, IOLA
License: MIT license
-----------------------------------------------------------------------------
highlight.pack.js
Source: https://highlightjs.org
Copyright: 2006 Ivan Sagalaev (https://github.com/isagalaev)
License: BSD License
-----------------------------------------------------------------------------
jquery.flot.js
Source: https://github.com/dnschnur/flot
Copyright: Ole Laursen, IOLA
License: MIT license
-----------------------------------------------------------------------------
jquery-scrollto.js
Source: https://github.com/balupton/jquery-scrollto
Copyright: Bevry Pty Ltd <[email protected]>
Expand All @@ -87,6 +87,26 @@ Copyright: @leChanteaux <santiago at mural.ly>
Mural.ly Dev Team <dev at mural.ly>
License: dfyw
-----------------------------------------------------------------------------
jquery.js
Source: http://jquery.com/
Copyright: 2005, 2014 jQuery Foundation, Inc.
License: MIT license
-----------------------------------------------------------------------------
jquery-ui.js
Source: https://jqueryui.com
Copyright: 2014 jQuery Foundation
License: MIT license
-----------------------------------------------------------------------------
jquery.hotkeys.js
Source: https://github.com/jeresig/jquery.hotkeys
Copyright: 2010 John Resig
License: Dual licensed under the MIT or GPL Version 2 licenses.
-----------------------------------------------------------------------------
jquery.visible.js
Source: https://github.com/customd/jquery-visible
Copyright: 2012, Digital Fusion
License: MIT license
-----------------------------------------------------------------------------
marked.js
Source: https://github.com/chjj/marked
Copyright: 2011-2014, Christopher Jeffrey
Expand All @@ -103,6 +123,11 @@ Copyright: Faruk Ates (https://twitter.com/KuraFire)
Richard Herrera (https://twitter.com/doctyper)
License: MIT license & BSD license
-----------------------------------------------------------------------------
rangy.js
Source: https://github.com/timdown/rangy
Copyright: 2015, Tim Down
License: MIT license
-----------------------------------------------------------------------------
seedrandom.js
Source: https://github.com/davidbau/seedrandom
Copyright: 2014 David Bau.
Expand All @@ -123,26 +148,6 @@ Source: https://github.com/julianshapiro/velocity
Copyright: 2014 The jQuery Foundation
License: MIT license
-----------------------------------------------------------------------------
jquery.js
Source: http://jquery.com/
Copyright: 2005, 2014 jQuery Foundation, Inc.
License: MIT license
-----------------------------------------------------------------------------
jquery-ui.js
Source: https://jqueryui.com
Copyright: 2014 jQuery Foundation
License: MIT license
-----------------------------------------------------------------------------
jquery.hotkeys.js
Source: https://github.com/jeresig/jquery.hotkeys
Copyright: 2010 John Resig
License: Dual licensed under the MIT or GPL Version 2 licenses.
-----------------------------------------------------------------------------
jquery.visible.js
Source: https://github.com/customd/jquery-visible
Copyright: 2012, Digital Fusion
License: MIT license
-----------------------------------------------------------------------------
underscore.js
Source: http://underscorejs.org
Copyright: 2009-2015 Jeremy Ashkenas, DocumentCloud
Expand All @@ -153,11 +158,6 @@ Source: http://spinejs.com
Copyright: 2011 Alex MacCaw <[email protected]>
License: MIT license
-----------------------------------------------------------------------------
rangy.js
Source: https://github.com/timdown/rangy
Copyright: 2015, Tim Down
License: MIT license
-----------------------------------------------------------------------------
word_filter.js
Source: https://gist.github.com/sbrin/6801034
Copyright: 2015, sbrin - https://github.com/sbrin
Expand Down

0 comments on commit 5e28c50

Please sign in to comment.