Merge branch 'master' of https://github.com/jeremiaheb/EntryApplication

Author: jeremiaheb

Gemfile

@@ -16,15 +16,15 @@ gem 'uglifier'
 gem 'sprockets', '3.6.3'
 gem 'jquery-ui-rails', '~>5.0'
 gem 'jquery-rails'
-gem 'jquery-datatables-rails', github: 'rweng/jquery-datatables-rails'
+gem 'jquery-datatables-rails', git: 'https://github.com/rweng/jquery-datatables-rails.git'
 gem 'twitter-bootstrap-rails'
 gem 'less-rails-bootstrap'
 gem 'bootstrap-datepicker-rails'
 gem 'select2-rails', '3.2.1'
 gem 'nested_form'
 gem 'devise'
 gem 'cancancan', '~>2.0'
-gem 'prawn', :git => 'git://github.com/prawnpdf/prawn.git'
+gem 'prawn', :git => 'https://github.com/prawnpdf/prawn.git'
 gem 'prawn-table'
 gem 'axlsx_rails'
 gem "net-ssh"

Gemfile.lock

@@ -1,13 +1,13 @@
 GIT
-  remote: git://github.com/prawnpdf/prawn.git
+  remote: https://github.com/prawnpdf/prawn.git
   revision: dc088578d12c1e44fb866176259dedda49c6c591
   specs:
     prawn (2.2.2)
       pdf-core (~> 0.7.0)
       ttfunk (~> 1.5)
 
 GIT
-  remote: git://github.com/rweng/jquery-datatables-rails.git
+  remote: https://github.com/rweng/jquery-datatables-rails.git
   revision: d486b31b192a2924b1913e080ad23460e6b96d31
   specs:
     jquery-datatables-rails (3.4.0)