Bump to 2.0.2 (#7)

* Bump to 2.0.2
factore · May 3, 2016 · f6e4e00 · f6e4e00
1 parent fa184c8
commit f6e4e00
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,8 @@
-2.0.0 2016-05-02
+2.0.2 2016-05-03
+  * Fix issues with ClientSideValidations gem
+  * Bump to Rails 5.0.0beta4
+
+2.0.1 2016-05-02
   * Improve systems for building, serving, and deploying webpack assets w/ Rails in the test/dummy app.  These systems can (and will) be used as a sample for creating new Tenon-based projects.
 
 2.0.0 2016-04-01

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -38,18 +38,18 @@ GIT
 
 GIT
   remote: https://github.com/DavyJonesLocker/client_side_validations
-  revision: 28561bc23da13b8124a675e406236bdbae7b1a4c
+  revision: e89ba8a452bcf37a7ad453f37359820d41f040d0
   branch: rails5
   specs:
     client_side_validations (5.0.0)
       jquery-rails (~> 4.0, >= 4.0.1)
       js_regex (~> 1.0, >= 1.0.9)
-      rails (>= 5.0.0.beta3, < 5.1.0)
+      rails (>= 5.0.0.beta4, < 5.1.0)
 
 PATH
   remote: .
   specs:
-    tenon (2.0.1)
+    tenon (2.0.2)
       active_model_serializers
       awesome_nested_set
       cocoon
@@ -163,12 +163,12 @@ GEM
       actionpack (>= 3.1)
       railties (>= 3.1)
       sass (>= 3.2)
-    jquery-rails (4.1.0)
-      rails-dom-testing (~> 1.0)
+    jquery-rails (4.1.1)
+      rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    js_regex (1.0.13)
-      regexp_parser (= 0.3.2)
+    js_regex (1.0.14)
+      regexp_parser (= 0.3.3)
     json (1.8.3)
     launchy (2.4.3)
       addressable (~> 2.3)
@@ -250,7 +250,7 @@ GEM
       execjs
       rails (>= 3.2)
       tilt
-    regexp_parser (0.3.2)
+    regexp_parser (0.3.3)
     request_store (1.3.0)
     responders (2.1.1)
       railties (>= 4.2.0, < 5.1)

diff --git a/app/assets/javascripts/tenon/application.js b/app/assets/javascripts/tenon/application.js
@@ -2,4 +2,3 @@
 //= require cocoon
 //= require jquery-fileupload/basic
 //= require jquery-fileupload/vendor/tmpl
-//= require rails.validations
diff --git a/lib/tenon/version.rb b/lib/tenon/version.rb
@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end
diff --git a/tenon.gemspec b/tenon.gemspec
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'uglifier'
 
   # The actual gem dependencies
-  s.add_dependency 'rails', '5.0.0.beta4'
+  s.add_dependency 'rails', '5.0.0.beta3'
 
   s.add_dependency 'active_model_serializers'
   s.add_dependency 'cocoon'

diff --git a/test/dummy/app/views/layouts/tenon/login.html.haml b/test/dummy/app/views/layouts/tenon/login.html.haml
@@ -10,7 +10,8 @@
       = Tenon::MySettings.site_title.present? ? Tenon::MySettings.site_title : 'Tenon'
 
     = stylesheet_link_tag '//fonts.googleapis.com/icon?family=Material+Icons'
-    = render 'tenon/shared/assets'
+    = stylesheet_link_tag 'tenon/tenon'
+    = javascript_include_tag 'tenon/tenon_manifest'
     = yield :scripts
 
   %body{ data: {controller: controller_name, action: action_name} }