Merge pull request #769 from hennevogel/gems

Gems: Update MySQL2, switch assets to rails-assets.org
This commit is contained in:
Henne Vogelsang 2016-02-18 14:03:35 +01:00
commit 8f42f79423
12 changed files with 76 additions and 3505 deletions

View file

@ -7,6 +7,7 @@ GIT
GEM
remote: https://rubygems.org/
remote: https://rails-assets.org/
specs:
actionmailer (4.2.5.1)
actionpack (= 4.2.5.1)
@ -208,7 +209,6 @@ GEM
jwt (1.0.0)
launchy (2.4.2)
addressable (~> 2.3)
leaflet-rails (0.7.4)
letter_opener (1.2.0)
launchy (~> 2.2)
listen (2.7.2)
@ -245,7 +245,7 @@ GEM
multi_json (1.11.2)
multi_xml (0.5.5)
multipart-post (2.0.0)
mysql2 (0.3.16)
mysql2 (0.4.2)
netrc (0.10.3)
nio4r (1.1.0)
nokogiri (1.6.7.2)
@ -330,6 +330,18 @@ GEM
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.5.1)
sprockets-rails
rails-assets-date.format (1.2.3)
rails-assets-holderjs (2.9.1)
rails-assets-jquery (2.2.0)
rails-assets-jquery-smooth-scroll (1.7.2)
rails-assets-jquery (>= 1.4.2)
rails-assets-leaflet (0.7.7)
rails-assets-momentjs (2.11.2)
rails-assets-spectrum (1.8.0)
rails-assets-jquery (>= 1.7.2)
rails-assets-tinycolor (1.3.0)
rails-assets-trianglify (0.4.0)
rails-assets-waypoints (4.0.0)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
@ -500,10 +512,8 @@ DEPENDENCIES
hoptoad_notifier (~> 2.3)
jquery-datatables-rails (~> 2.2.1)
jquery-rails
leaflet-rails (~> 0.7.4)
letter_opener
mina
momentjs-rails (>= 2.8.1)
money-rails
mysql2
omniauth
@ -519,6 +529,15 @@ DEPENDENCIES
prawn_rails
quiet_assets
rails (~> 4.2)
rails-assets-date.format!
rails-assets-holderjs!
rails-assets-jquery-smooth-scroll!
rails-assets-leaflet!
rails-assets-momentjs!
rails-assets-spectrum!
rails-assets-tinycolor!
rails-assets-trianglify!
rails-assets-waypoints!
rails-observers
rdoc-generator-fivefish
redcarpet
@ -538,3 +557,6 @@ DEPENDENCIES
uglifier (>= 1.3.0)
web-console (~> 2.0)
whenever
BUNDLED WITH
1.11.2