Permalink
Browse files

added gemfile.lock to .gitignore

  • Loading branch information...
1 parent c8ca452 commit b0b39de8a2bfe9b0f9b563d8ed6f07f1de708ce2 @abunsen abunsen committed Oct 14, 2012
Showing with 8 additions and 163 deletions.
  1. +2 −1 .gitignore
  2. +0 −156 Gemfile.lock
  3. +6 −6 app/controllers/account_controller.rb
View
@@ -23,4 +23,5 @@ config/settings/*.local.yml
config/environments/*.local.yml
*.swp
-.DS_Store
+.DS_Store
+Gemfile.lock
View
@@ -1,156 +0,0 @@
-GEM
- remote: https://rubygems.org/
- specs:
- actionmailer (3.2.8)
- actionpack (= 3.2.8)
- mail (~> 2.4.4)
- actionpack (3.2.8)
- activemodel (= 3.2.8)
- activesupport (= 3.2.8)
- builder (~> 3.0.0)
- erubis (~> 2.7.0)
- journey (~> 1.0.4)
- rack (~> 1.4.0)
- rack-cache (~> 1.2)
- rack-test (~> 0.6.1)
- sprockets (~> 2.1.3)
- activemodel (3.2.8)
- activesupport (= 3.2.8)
- builder (~> 3.0.0)
- activerecord (3.2.8)
- activemodel (= 3.2.8)
- activesupport (= 3.2.8)
- arel (~> 3.0.2)
- tzinfo (~> 0.3.29)
- activeresource (3.2.8)
- activemodel (= 3.2.8)
- activesupport (= 3.2.8)
- activesupport (3.2.8)
- i18n (~> 0.6)
- multi_json (~> 1.0)
- annotate (2.5.0)
- rake
- arel (3.0.2)
- bcrypt-ruby (3.0.1)
- builder (3.0.3)
- cocaine (0.4.0)
- coffee-rails (3.2.2)
- coffee-script (>= 2.2.0)
- railties (~> 3.2.0)
- coffee-script (2.2.0)
- coffee-script-source
- execjs
- coffee-script-source (1.3.3)
- curb (0.8.1)
- daemons (1.1.9)
- devise (2.1.2)
- bcrypt-ruby (~> 3.0)
- orm_adapter (~> 0.1)
- railties (~> 3.1)
- warden (~> 1.2.1)
- erubis (2.7.0)
- execjs (1.4.0)
- multi_json (~> 1.0)
- formtastic (2.2.1)
- actionpack (>= 3.0)
- formtastic-bootstrap (2.0.0)
- formtastic (~> 2.2)
- formtastic-bootstrap
- hike (1.2.1)
- i18n (0.6.1)
- journey (1.0.4)
- jquery-rails (2.1.3)
- railties (>= 3.1.0, < 5.0)
- thor (~> 0.14)
- json (1.7.5)
- kgio (2.7.4)
- libv8 (3.3.10.4)
- mail (2.4.4)
- i18n (>= 0.4.0)
- mime-types (~> 1.16)
- treetop (~> 1.4.8)
- mime-types (1.19)
- multi_json (1.3.6)
- mysql2 (0.3.11)
- orm_adapter (0.4.0)
- paperclip (3.3.0)
- activemodel (>= 3.0.0)
- activerecord (>= 3.0.0)
- activesupport (>= 3.0.0)
- cocaine (~> 0.4.0)
- mime-types
- polyglot (0.3.3)
- rack (1.4.1)
- rack-cache (1.2)
- rack (>= 0.4)
- rack-ssl (1.3.2)
- rack
- rack-test (0.6.2)
- rack (>= 1.0)
- rails (3.2.8)
- actionmailer (= 3.2.8)
- actionpack (= 3.2.8)
- activerecord (= 3.2.8)
- activeresource (= 3.2.8)
- activesupport (= 3.2.8)
- bundler (~> 1.0)
- railties (= 3.2.8)
- rails_config (0.3.1)
- activesupport (>= 3.0)
- railties (3.2.8)
- actionpack (= 3.2.8)
- activesupport (= 3.2.8)
- rack-ssl (~> 1.3.2)
- rake (>= 0.8.7)
- rdoc (~> 3.4)
- thor (>= 0.14.6, < 2.0)
- raindrops (0.10.0)
- rake (0.9.2.2)
- rdoc (3.12)
- json (~> 1.4)
- sass (3.2.1)
- sass-rails (3.2.5)
- railties (~> 3.2.0)
- sass (>= 3.1.10)
- tilt (~> 1.3)
- sprockets (2.1.3)
- hike (~> 1.2)
- rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
- therubyracer (0.10.2)
- libv8 (~> 3.3.10)
- thor (0.16.0)
- tilt (1.3.3)
- treetop (1.4.10)
- polyglot
- polyglot (>= 0.3.1)
- tzinfo (0.3.33)
- uglifier (1.3.0)
- execjs (>= 0.3.0)
- multi_json (~> 1.0, >= 1.0.2)
- unicorn (4.4.0)
- kgio (~> 2.6)
- rack
- raindrops (~> 0.7)
- warden (1.2.1)
- rack (>= 1.0)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- annotate (= 2.5.0)
- coffee-rails (~> 3.2.1)
- curb
- devise (= 2.1.2)
- formtastic-bootstrap
- jquery-rails
- json
- mysql2
- paperclip (= 3.3.0)
- rails (= 3.2.8)
- rails_config
- sass-rails (~> 3.2.3)
- therubyracer
- uglifier (>= 1.0.3)
- unicorn
@@ -16,18 +16,18 @@ def stripe_connect
stripe_response = JSON.parse(http.body_str)
if stripe_response.has_key? "error"
- @error = stripe_response[:error_description]
+ @error = stripe_response["error_description"]
render "account/stripe_error"
end
# the presence of this one key indicates success
if stripe_response.has_key? "stripe_publishable_key"
current_user.update_attributes({
- :stripe_livemode => stripe_response[:livemode],
- :stripe_publishable_key => stripe_response[:stripe_publishable_key],
- :stripe_user_id => stripe_response[:stripe_user_id],
- :stripe_refresh_token => stripe_response[:refresh_token],
- :stripe_access_token => stripe_response[:access_token]
+ :stripe_livemode => stripe_response["livemode"],
+ :stripe_publishable_key => stripe_response["stripe_publishable_key"],
+ :stripe_user_id => stripe_response["stripe_user_id"],
+ :stripe_refresh_token => stripe_response["refresh_token"],
+ :stripe_access_token => stripe_response["access_token"]
})
@code = current_user.stripe_access_token
else

0 comments on commit b0b39de

Please sign in to comment.