phrasing 3.2.8 → 3.2.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +11 -8
  3. data/CHANGELOG.md +4 -0
  4. data/Gemfile +1 -2
  5. data/lib/phrasing.rb +2 -2
  6. data/lib/phrasing/version.rb +1 -1
  7. data/phrasing.gemspec +1 -1
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 9b5fb967e75c11f73ea2f60a81c83f5eb121bf91
4
- data.tar.gz: 1e8b527c8a9307a5264fb9d62771697713a41f5d
3
+ metadata.gz: 206cd001ae079192daf6410a4b9be6bb757ea18e
4
+ data.tar.gz: 63433e277e04cfcfd66a89f4a4ffba8f3f94f7c9
5
5
  SHA512:
6
- metadata.gz: 128cedbf49e4c1ac8d5ad775a7e05746ee05705f73032f959be34978b531a7baf70fc5499e026f996e3b67683d26fff7fa9f3317a9ced36a14c02127ad7fb976
7
- data.tar.gz: d6770c0a73a6d305c995942154741a238b4a57b0b8f55ef243900616ca77c303b49db6a8fe9a8e38991d45ef74c03d6b1e44d8ee0fb2cf169cc1f51eedb8ab43
6
+ metadata.gz: c9c161bcfbea4965777007fe2a0c3e6b67291f803663f151c7ee8dacf8bc8385754a419a314f7c9c4b7a7a326c3ba161621909e675b831dd94a157cca440d41a
7
+ data.tar.gz: 1c0a1ff71038dd6cb0d4130bb507ca6630249c13083a2bd55fa2fa647ca9acf94b8228a6e8f7e73a2edaeb60a79f255c0fc9f8ce327c8a475f50978576d93433
data/.travis.yml CHANGED
@@ -1,9 +1,12 @@
1
1
  language: ruby
2
- rvm:
3
- - 1.9.3
4
- - 2.0.0
5
- - 2.1.2
6
- env:
7
- - "RAILS_VERSION=3.2.0"
8
- - "RAILS_VERSION=4.0.0"
9
- - "RAILS_VERSION=4.1.0"
2
+
3
+ matrix:
4
+ include:
5
+ - rvm: 1.9.3
6
+ env: "RAILS_VERSION=3.2.0"
7
+ - rvm: 2.0.0
8
+ env: "RAILS_VERSION=4.0.0"
9
+ - rvm: 2.1.2
10
+ env: "RAILS_VERSION=4.1.0"
11
+ - rvm: 2.2.0
12
+ env: "RAILS_VERSION=4.2.0"
data/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # Phrasing Change Log
2
2
 
3
+ ## 3.2.9 (January 7th, 2015)
4
+
5
+ Require only haml, not haml-rails.
6
+
3
7
  ## 3.2.8 (January 6th, 2015)
4
8
 
5
9
  Fix confirm dialogs when deleting phrases and phrase versions.
data/Gemfile CHANGED
@@ -8,8 +8,7 @@ rails_version = ENV["RAILS_VERSION"] || "4.1.4"
8
8
  gem "rails", "~> #{rails_version}"
9
9
 
10
10
  gem 'factory_girl_rails'
11
- gem 'haml-rails'
12
11
  gem 'sqlite3'
13
12
  gem 'rspec-rails'
14
13
  gem 'capybara', '~> 2.2.0'
15
- gem 'jasmine-rails'
14
+ gem 'jasmine-rails'
data/lib/phrasing.rb CHANGED
@@ -4,7 +4,7 @@ require "phrasing/simple"
4
4
  require "phrasing/serializer"
5
5
  require 'jquery-rails'
6
6
  require 'jquery-cookie-rails'
7
- require 'haml-rails'
7
+ require 'haml'
8
8
 
9
9
  module Phrasing
10
10
  module Rails
@@ -79,4 +79,4 @@ module Phrasing
79
79
  end
80
80
 
81
81
 
82
- end
82
+ end
data/lib/phrasing/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Phrasing
2
- VERSION = "3.2.8"
2
+ VERSION = "3.2.9"
3
3
  end
data/phrasing.gemspec CHANGED
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
18
18
 
19
19
  s.add_dependency "rails", ">= 3.2.0"
20
20
  s.add_dependency "railties", ">= 3.2"
21
- s.add_dependency "haml-rails"
21
+ s.add_dependency "haml"
22
22
  s.add_dependency "jquery-rails"
23
23
  s.add_dependency "jquery-cookie-rails"
24
24
  s.add_dependency "sass"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: phrasing
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.2.8
4
+ version: 3.2.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tomislav Car
@@ -40,7 +40,7 @@ dependencies:
40
40
  - !ruby/object:Gem::Version
41
41
  version: '3.2'
42
42
  - !ruby/object:Gem::Dependency
43
- name: haml-rails
43
+ name: haml
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
46
  - - ">="