bullet_train 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '086758c1f9cac00d402ebe997e4ff73623d5ea12580cfad21278c8da8bef8ae5'
-  data.tar.gz: b4c4d63aa36fa9afc64c18e70b5d99f8cc022101242f5c0fd43dcf1969238e62
+  metadata.gz: '0677829999c2d36443830135c4e9253699a24ee451f79994cb1dde3c168d791e'
+  data.tar.gz: 35600ff4e75a7b1b5c1f9638568c776ab2d3a5aa4fee533a1521404c8464a637
 SHA512:
-  metadata.gz: 4a38b41f6424f60d6d7870d090e9fc6323392d19f3d723c3f3fb452512916a653bd4cd8e0fd13bf71ecd7dd83d8e3c8c6ab1ceb671d91ed93b471c804fdfe3f0
-  data.tar.gz: 72fabc14a5b3ea62f6490659ed84631d709dcd859e9711f6e93906d22f959960ef40c9822ed2330f706a1b95b76dbfb15a963f3b7f0e5d0a9f2812cb56f21862
+  metadata.gz: 9606c7f6d10dc6c50004b42a8c2b1dd8925c05da610c9dfd93f62ca43c7142a77f335536983f48c81dcb5a48fb1a384b4957cb6038990791cb1a13b0afc885e6
+  data.tar.gz: ea7ac99e62db85d828082ff1c8ff0fc90b1ff885f4c8549b3e424e7a24a0378abc8bd1e0367d3cc1b605de4f47dbeca279502071d3bc1ec890826107239d48ca

data/app/controllers/concerns/account/memberships/controller_base.rb

@@ -3,8 +3,8 @@ module Account::Memberships::ControllerBase
 
   included do
     account_load_and_authorize_resource :membership, :team,
-      member_actions: [:demote, :promote, :reinvite].merge(defined?(MEMBER_ACTIONS) ? MEMBER_ACTIONS : []),
-      collection_actions: [:search].merge(defined?(COLLECTION_ACTIONS) ? COLLECTION_ACTIONS : [])
+      member_actions: [:demote, :promote, :reinvite] + (defined?(MEMBER_ACTIONS) ? MEMBER_ACTIONS : []),
+      collection_actions: [:search] + (defined?(COLLECTION_ACTIONS) ? COLLECTION_ACTIONS : [])
   end
 
   def index

data/config/locales/en/teams.en.yml

@@ -77,7 +77,7 @@ en:
     teams: *teams
   activerecord:
     attributes:
-      user:
+      team:
         name: *name
         time_zone: *time_zone
         locale: *locale

data/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.0.12"
+  VERSION = "1.0.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Andrew Culver