corn_starch 1.9.40 → 1.9.41

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/corn_starch/corn_starch_controller.rb +1 -1
  3. data/lib/corn_starch/version.rb +1 -1
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f2316bfb2568db7ed4ee2ea2e9362281f0a3a01d
4
- data.tar.gz: 6ac6943e4e80323f62a478704c37a4da1740ea4d
3
+ metadata.gz: 430bcbd2dbb72f9ca134e6483c6b10b8ed311b96
4
+ data.tar.gz: 4e046a8c471408ba8f3531e23ab73089cdcf020d
5
5
  SHA512:
6
- metadata.gz: ceaefae521c4a41727cea60792e53040b06e6c9e9c2af23bb04149f959a7780280e4c1ba255ec43fd95888641acc409d137dc977b18e7752e06d6c3c5e0441f3
7
- data.tar.gz: a7b9493bceea5a689853065fb5e6537d98706612eee1b7b7d0e312113c7e6e71db50377befb18db276732360b20876adcaa27ab9f0d0de302659edfcf506ce35
6
+ metadata.gz: 2c3f14e49bb39cea0838cd4641f7a543a2febf8ea9c6664da7c2102984339c4a156c72d462df1bd9166aa3f0d7c182bb8216b51ef0288bfa141cb5022080d222
7
+ data.tar.gz: 01e44595d8cb69215aeeb6c2940462e56b61dfb6021e980049c4deb3b3d1f948888898fb1ab6eca86612834b5d047a4f9a3210ebe1d0ddb5c950f2c73e3f8258
data/app/controllers/corn_starch/corn_starch_controller.rb CHANGED
@@ -26,7 +26,7 @@ module CornStarch
26
26
  def default_url_options options = {}
27
27
 
28
28
  # Include Locale in all generated URLs
29
- { locale: I18n.locale }.merge options
29
+ options.merge locale: I18n.locale
30
30
  end
31
31
 
32
32
  # Private
data/lib/corn_starch/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module CornStarch
2
- VERSION = '1.9.40'
2
+ VERSION = '1.9.41'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: corn_starch
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.9.40
4
+ version: 1.9.41
5
5
  platform: ruby
6
6
  authors:
7
7
  - Eresse
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-07-13 00:00:00.000000000 Z
11
+ date: 2016-07-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler