Merge pull request #30 from webhippie/feature/version

Bumped to 1.0.4
webhippie · May 31, 2016 · 8e8aabe · 8e8aabe
2 parents a939bf6 + 71c53b6
commit 8e8aabe
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.0.4](https://github.com/webhippie/gettext_i18n_rails_js/releases/tag/v1.0.4) - 2016-05-31
+
+* Support ES2015 template strings (@bradbarrow)
+
 ## [1.0.3](https://github.com/webhippie/gettext_i18n_rails_js/releases/tag/v1.0.3) - 2015-11-03
 
 * Stop using bundler within the core lib (@domcleal)

diff --git a/Gemfile b/Gemfile
@@ -32,6 +32,9 @@ group :development do
   gem "guard", require: false
   gem "guard-rubocop", require: false
   gem "guard-rspec", require: false
+
+  # Temporary fix for a ruby 2.2 requirement
+  gem "listen", "~> 3.0.7"
 end
 
 group :test do

diff --git a/lib/gettext_i18n_rails_js/version.rb b/lib/gettext_i18n_rails_js/version.rb
@@ -27,7 +27,7 @@ module GettextI18nRailsJs
   class Version
     MAJOR = 1
     MINOR = 0
-    PATCH = 3
+    PATCH = 4
 
     PRE = nil
 

diff --git a/spec/gettext_i18n_rails_js/parser/javascript_spec.rb b/spec/gettext_i18n_rails_js/parser/javascript_spec.rb
@@ -139,7 +139,6 @@
       end
     end
 
-
     it "finds interpolated multi-line messages" do
       content = <<-'EOF'
         """ Parser should grab