mirror of
https://github.com/jcwimer/wrestlingApp
synced 2026-04-11 07:56:28 +00:00
Moved jquery and datatables back to asset pipline. Log out now works
This commit is contained in:
19
Gemfile.lock
19
Gemfile.lock
@@ -39,7 +39,7 @@ GEM
|
||||
arel (6.0.0)
|
||||
bcrypt (3.1.10)
|
||||
builder (3.2.2)
|
||||
cancan (1.6.10)
|
||||
cancancan (1.10.1)
|
||||
coffee-rails (4.0.1)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
@@ -63,6 +63,11 @@ GEM
|
||||
jbuilder (2.2.13)
|
||||
activesupport (>= 3.0.0, < 5)
|
||||
multi_json (~> 1.2)
|
||||
jquery-datatables-rails (3.3.0)
|
||||
actionpack (>= 3.1)
|
||||
jquery-rails
|
||||
railties (>= 3.1)
|
||||
sass-rails
|
||||
jquery-rails (4.0.3)
|
||||
rails-dom-testing (~> 1.0)
|
||||
railties (>= 4.2.0)
|
||||
@@ -72,15 +77,15 @@ GEM
|
||||
nokogiri (>= 1.5.9)
|
||||
mail (2.6.3)
|
||||
mime-types (>= 1.16, < 3)
|
||||
mime-types (2.4.3)
|
||||
mime-types (2.5)
|
||||
mini_portile (0.6.2)
|
||||
minitest (5.6.0)
|
||||
minitest (5.6.1)
|
||||
multi_json (1.11.0)
|
||||
mysql2 (0.3.18)
|
||||
nokogiri (1.6.6.2)
|
||||
mini_portile (~> 0.6.0)
|
||||
orm_adapter (0.5.0)
|
||||
passenger (5.0.6)
|
||||
passenger (5.0.7)
|
||||
rack
|
||||
rake (>= 0.8.1)
|
||||
pg (0.18.1)
|
||||
@@ -121,6 +126,7 @@ GEM
|
||||
rake (10.4.2)
|
||||
rb-readline (0.5.2)
|
||||
rdoc (4.2.0)
|
||||
json (~> 1.4)
|
||||
responders (2.1.0)
|
||||
railties (>= 4.2.0, < 5)
|
||||
round_robin_tournament (0.0.1)
|
||||
@@ -133,7 +139,7 @@ GEM
|
||||
sdoc (0.4.1)
|
||||
json (~> 1.7, >= 1.7.7)
|
||||
rdoc (~> 4.0)
|
||||
spring (1.3.4)
|
||||
spring (1.3.5)
|
||||
sprockets (2.12.3)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
@@ -161,10 +167,11 @@ PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
cancan
|
||||
cancancan
|
||||
coffee-rails (~> 4.0.0)
|
||||
devise
|
||||
jbuilder (~> 2.0)
|
||||
jquery-datatables-rails
|
||||
jquery-rails
|
||||
mysql2
|
||||
passenger
|
||||
|
||||
Reference in New Issue
Block a user