fixed user_path

sashazykov · sashazykov · commit 28e90d3fb1db · 2015-01-12T14:18:03.000+05:30
diff --git a/app/assets/javascripts/projects.js.coffee b/app/assets/javascripts/projects.js.coffee
@@ -6,4 +6,4 @@ init = () ->
   $('.qrcode').each () ->
     $(this).qrcode($(this).attr('data-qrcode'));
 
-$(document).on 'ready page:load', init
+$(document).on 'ready page:load', init
diff --git a/app/assets/javascripts/users.js.coffee b/app/assets/javascripts/users.js.coffee
@@ -8,21 +8,21 @@ load_bootstrap_validator = ->
             message: I18n.t('js.errors.email.invalid')
           notEmpty:
             message: I18n.t('js.errors.email.blank')
-
+          
       "user[password]":
         validators:
           notEmpty:
             message: I18n.t('js.errors.password.blank')
           identical:
-            field: 'user[password_confirmation]'
+            field: 'user[password_confirmation]' 
             message: I18n.t('js.errors.password.invalid')
-
+      
       "user[password_confirmation]":
         validators:
           notEmpty:
             message: I18n.t('js.errors.password_confirmation.blank')
           identical:
-            field: 'user[password]'
+            field: 'user[password]' 
             message: I18n.t('js.errors.password_confirmation.invalid')
   $('.session_form').bootstrapValidator
     message: I18n.t('js.errors.value.invalid')
@@ -33,10 +33,10 @@ load_bootstrap_validator = ->
             message: I18n.t('js.errors.email.invalid')
           notEmpty:
             message: I18n.t('js.errors.email.blank')
-
+          
       "user[password]":
         validators:
           notEmpty:
             message: I18n.t('js.errors.password_confirmation.blank')
 
-$(document).on "ready page:load", load_bootstrap_validator
+$(document).on "ready page:load", load_bootstrap_validator
diff --git a/app/models/deposit.rb b/app/models/deposit.rb
@@ -26,4 +26,4 @@ def project_name
     project.full_name
   end
 
-end
+end
diff --git a/app/views/common/_menu.html.haml b/app/views/common/_menu.html.haml
@@ -2,4 +2,4 @@
   %li{class: controller_name == 'home' ? 'active' : ''}
     %a{href: root_path}= t('menu.home')
   %li{class: controller_name == 'projects' || @project ? 'active' : ''}
-    %a{href: projects_path}= t('menu.projects')
+    %a{href: projects_path}= t('menu.projects')
diff --git a/app/views/user_mailer/check_bitcoin_address.html.haml b/app/views/user_mailer/check_bitcoin_address.html.haml
@@ -6,9 +6,9 @@
   %strong= @user.bitcoin_address
 
 %p
-  If this address is not yours, please
+  If this address is not yours, please 
   = link_to 'update it', login_users_url(token: @user.login_token)
-
+  
 %p Thank you for contributing to Open Source and sorry for troubles!
 
-%p= link_to "tip4commit.com", "http://tip4commit.com/"
+%p= link_to "tip4commit.com", "http://tip4commit.com/"
diff --git a/app/views/users/index.html.haml b/app/views/users/index.html.haml
@@ -9,7 +9,7 @@
     %tbody
       - @users.each do |user|
         %tr
-          %td
+          %td 
             - if user.nickname.blank?
               = user.display_name
             - else
diff --git a/config/database.yml.sample b/config/database.yml.sample
@@ -23,5 +23,5 @@ production:
   encoding: utf8
   database: tip4commit
   username: root
-  password:
-  socket: /var/run/mysqld/mysqld.sock
+  password: 
+  socket: /var/run/mysqld/mysqld.sock
diff --git a/config/deploy.rb b/config/deploy.rb
@@ -40,4 +40,4 @@
 
   after :finishing, 'deploy:cleanup'
 
-end
+end
diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -16,7 +16,7 @@
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  config.action_mailer.default_url_options = { :host => "localhost:3000" }
+  config.action_mailer.default_url_options = { :host => "localhost:3000" }  
 
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
diff --git a/config/i18n-js.yml b/config/i18n-js.yml
@@ -1,3 +1,3 @@
 translations:
   - file: "app/assets/javascripts/i18n/translations.js"
-    only: ['*.js']
+    only: ['*.js']
diff --git a/config/initializers/demoji.rb b/config/initializers/demoji.rb
@@ -1 +1 @@
-ActiveRecord::Base.send :include, Demoji
+ActiveRecord::Base.send :include, Demoji
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
@@ -3,4 +3,4 @@
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
 # Mime::Type.register_alias "text/html", :iphone
-Mime::Type.register "image/svg+xml", :svg
+Mime::Type.register "image/svg+xml", :svg
diff --git a/config/routes.rb b/config/routes.rb
@@ -10,6 +10,7 @@
   get '/users/login'                       => 'users#login' ,                                                                               :as => 'login_users'
   get '/users/:user_id/tips'               => 'tips#index' ,                    :constraints => {:user_id    => /\d+/}                    , :as => 'user_tips'
   get '/users/:nickname/tips'              => 'tips#index' ,                    :constraints => {:nickname   => /\w[\d\w\-]*/}            , :as => 'user_tips_pretty'
+  get '/users/:id'                         => 'users#show' ,                    :constraints => {:id         => /\d+/}                    , :as => 'user'
   get '/users/:nickname'                   => 'users#show' ,                    :constraints => {:nickname   => /\w[\d\w\-]*/}            , :as => 'user_pretty'
 
   get '/projects/:project_id/tips'         => 'tips#index' ,                    :constraints => {:project_id => /\d+/}                    , :as => 'project_tips'
diff --git a/db/migrate/20140620123610_add_decided_at_to_tips.rb b/db/migrate/20140620123610_add_decided_at_to_tips.rb
@@ -2,4 +2,4 @@ class AddDecidedAtToTips < ActiveRecord::Migration
   def change
     add_column :tips, :decided_at, :timestamp
   end
-end
+end
diff --git a/lib/bitcoin_address_validator.rb b/lib/bitcoin_address_validator.rb
@@ -26,7 +26,7 @@ def valid_bitcoin_address?(address)
 
   def version(address)
     decoded = b58_decode(address, 25)
-
+    
     version = decoded[0, 1]
     checksum = decoded[-4, decoded.length]
     vh160 = decoded[0, decoded.length - 4]
diff --git a/public/robots.txt b/public/robots.txt
@@ -1,3 +1,3 @@
 User-agent: *
 Disallow: /users/
-Crawl-delay: 10
+Crawl-delay: 10
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
@@ -48,4 +48,4 @@
     end
 
   end
-end
+end

-Original file line number
+Diff line change
     project.full_name
   end
 -end
 +end
Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,4 @@`
`40`	`40`
`41`	`41`	`after :finishing, 'deploy:cleanup'`
`42`	`42`
`43`		`-end`
	`43`	`+end`