Merge branch 'master' into use_one_signal_instead_of_zeropush_for_ios…

…_notifications
rughh · Feb 10, 2016 · 38fd0fc · 38fd0fc
2 parents e8fb163 + 5614596
commit 38fd0fc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/app.json b/app.json
@@ -1,8 +1,5 @@
 {
   "name": "on_ruby",
-  "scripts": {
-    "postdeploy": "bundle exec rake db:migrate"
-  },
   "env": {
     "ASIN_KEY": {
       "required": true

diff --git a/app/assets/stylesheets/application.sass b/app/assets/stylesheets/application.sass
@@ -39,11 +39,6 @@ $ruby-red: #C81B47
 @import "_base/elements"
 @import "_modules/**/*"
 
-#peek
-  position: fixed
-  bottom: 0
-  width: 100%
-
 header
   display: block
   +phone
@@ -263,7 +258,7 @@ header
       label
         margin: 0em
 
-    input[type=text], input[type=email]
+    input[type=text], input[type=email], input[type=url]
       width: 40em
       +phone
         width: 90%

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -52,7 +52,7 @@ def handle_twitter_attributes(hash)
     self.twitter      = hash['info']['nickname']
     self.name         = hash['info']['name']
     self.image        = hash['info']['image']
-    self.url          = hash['info']['urls']['Website']
+    self.url          = hash['info']['urls']['Website'] unless self.url
     self.description  = hash['info']['description'] unless self.description
     self.location     = hash['info']['location']
   end
@@ -63,7 +63,7 @@ def handle_github_attributes(hash)
     self.email        = hash['info']['email'] unless self.email
     self.name         = hash['info']['name'].blank? ? hash['info']['nickname'] : hash['info']['name']
     self.image        = hash['info']['image']
-    self.url          = hash['info']['urls']['Blog'] || hash['info']['urls']['GitHub']
+    self.url          = hash['info']['urls']['Blog'] || hash['info']['urls']['GitHub'] unless self.url
     self.description  = hash['extra']['raw_info']['bio'] unless self.description
     self.location     = hash['extra']['raw_info']['location']
   end

diff --git a/app/views/users/edit.slim b/app/views/users/edit.slim
@@ -9,6 +9,7 @@ section
     - unless user.with_provider? :github
         = f.input :github, input_html: { placeholder: 'GitHub handle' }
     = f.input :email
+    = f.input :url
     = f.input :description, type: :text_area
     .info== t("topic.markdown")
     br