ember-auth-rails 3.4.1 → 3.4.2

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 (4) hide show
  1. data/app/assets/javascripts/ember-auth/ember-auth.js +1 -1
  2. data/lib/ember-auth/rails/version.rb +1 -1
  3. data/lib/ember-auth/version.rb +1 -1
  4. metadata +2 -2
data/app/assets/javascripts/ember-auth/ember-auth.js CHANGED
@@ -185,7 +185,7 @@
185
185
  if (!Auth.Config.get('rememberMe')) {
186
186
  return;
187
187
  }
188
- if (token = $.cookie('ember-auth-remember-me')) {
188
+ if (!Auth.get('authToken') && (token = $.cookie('ember-auth-remember-me'))) {
189
189
  data = {};
190
190
  data[Auth.Config.get('rememberTokenKey')] = token;
191
191
  return Auth.signIn(data);
data/lib/ember-auth/rails/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module EmberAuth
2
2
  module Rails
3
- VERSION = '3.4.1'
3
+ VERSION = '3.4.2'
4
4
  end
5
5
  end
data/lib/ember-auth/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EmberAuth
2
- VERSION = '2.2.1'
2
+ VERSION = '2.2.2'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ember-auth-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.4.1
4
+ version: 3.4.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-02-23 00:00:00.000000000 Z
12
+ date: 2013-02-27 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: ember-rails