Skip to content

Commit

Permalink
Merge pull request #63 from Shopify/0.1.5
Browse files Browse the repository at this point in the history
bump version to 0.1.5
  • Loading branch information
richardmonette committed Mar 16, 2016
2 parents 129d0b4 + 1678f14 commit 1842a21
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 26 deletions.
39 changes: 17 additions & 22 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
PATH
remote: .
specs:
twine-rails (0.1.4)
twine-rails (0.1.5)
coffee-rails

GEM
remote: https://rubygems.org/
specs:
actionpack (5.0.0.beta1)
actionview (= 5.0.0.beta1)
activesupport (= 5.0.0.beta1)
rack (~> 2.x)
rack-test (~> 0.6.3)
actionpack (4.2.6)
actionview (= 4.2.6)
activesupport (= 4.2.6)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.0.0.beta1)
activesupport (= 5.0.0.beta1)
actionview (4.2.6)
activesupport (= 4.2.6)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activesupport (5.0.0.beta1)
concurrent-ruby (~> 1.0)
activesupport (4.2.6)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
method_source
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
builder (3.2.2)
coffee-rails (4.1.1)
Expand All @@ -35,20 +34,17 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.0)
erubis (2.7.0)
execjs (2.6.0)
i18n (0.7.0)
json (1.8.3)
loofah (2.0.3)
nokogiri (>= 1.5.9)
method_source (0.8.2)
mini_portile2 (2.0.0)
minitest (5.8.3)
nokogiri (1.6.7.1)
minitest (5.8.4)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
rack (2.0.0.alpha)
json
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
rails-deprecated_sanitizer (1.0.3)
Expand All @@ -57,12 +53,11 @@ GEM
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (5.0.0.beta1)
actionpack (= 5.0.0.beta1)
activesupport (= 5.0.0.beta1)
method_source
railties (4.2.6)
actionpack (= 4.2.6)
activesupport (= 4.2.6)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "twine",
"version": "0.1.4",
"version": "0.1.5",
"homepage": "https://github.com/Shopify/twine",
"authors": [
"Shopify Inc"
Expand Down
2 changes: 1 addition & 1 deletion dist/twine.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/twine-rails/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module TwineRails
VERSION = '0.1.4'
VERSION = '0.1.5'
end
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "twine",
"version": "0.1.4",
"version": "0.1.5",
"description": "A minimalistic 2-way binding system",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit 1842a21

Please sign in to comment.