Merge branch 'release/0.2.26_fix.8'

* release/0.2.26_fix.8:
  Add secure codes to travis.yml
  Fix members create
  edit logger backtrace

.travis.yml

@@ -1,15 +1,21 @@
 language: ruby
 rvm:
-  - 2.1
+- 2.1
 env:
-  - DB=postgres
+- DB=postgres
 script:
-  - gem install tilt -v '1.4.1'
-  - gem install byebug -v '3.5.1'
-  - gem install sdoc -v '0.4.1'
-  - cp config/secrets.yml.sample config/secrets.yml
-  - cp config/database.yml.sample config/database.yml
-  - cp config/oauth.yml.sample config/oauth.yml
-  - RAILS_ENV=test bundle exec rake db:create db:migrate test
+- gem install tilt -v '1.4.1'
+- gem install byebug -v '3.5.1'
+- gem install sdoc -v '0.4.1'
+- cp config/secrets.yml.sample config/secrets.yml
+- cp config/database.yml.sample config/database.yml
+- cp config/oauth.yml.sample config/oauth.yml
+- RAILS_ENV=test bundle exec rake db:create db:migrate test
 services:
-  - redis-server
+- redis-server
+oauth_keys:
+  foursquare:
+    client_id:
+      secure: Wpwfel3kNPNj3i9v7aQy+HksM3ag7ddg01ral44F9XIJqqiPBvZnWn74bB4YExrbHynvTK5y1Gb1J61Z/Zu8daZVNrj7LL/tssWG+bzYkVLfqu3X7HoLX3DX8ZO15pV9cpL7g3cA556cjs7pIoxBxLFgWeSCQTuXfQY4BcqO4Js=
+    client_secret:
+      secure: LBdGyDpEZMD9ZincYYmOQj5DlsvleAN/MgwLJHuTfnvnWqsC1GdM8KmWu1yYCyjlNWvvaknNulGhqed9iTiDW4blMsnm8W+7xBeCY3bXCxxJn1Jyp/jjceYH8A+Ok8qOQdmu27n6JER1WFDyqDXu0ZS1VyTHMf9cvHepFyCqg1w=

app/controllers/application_controller.rb

@@ -15,13 +15,13 @@ class ApplicationController < ActionController::Base
 
     rescue_from ActionController::RoutingError do |exception|
       Rails.logger.warn "ERROR MESSAGE: #{exception.message}"
-      Rails.logger.warn "BACKTRACE: #{exception.backtrace.join("\n")}"
+      Rails.logger.warn "BACKTRACE: #{exception.backtrace.first(30).join("\n")}"
       redirect_to not_found_page_path
     end
 
     rescue_from ActionView::MissingTemplate, ActiveRecord::RecordNotFound, NoMethodError do |exception|
       Rails.logger.warn "ERROR MESSAGE: #{exception.message}"
-      Rails.logger.warn "BACKTRACE: #{exception.backtrace.join("\n")}"
+      Rails.logger.warn "BACKTRACE: #{exception.backtrace.first(30).join("\n")}"
       redirect_to server_error_page_path
     end
   end

app/controllers/web/members_controller.rb

@@ -4,7 +4,6 @@ class Web::MembersController < Web::ApplicationController
   def new
     member = current_user.becomes! Member
     @member_form = MemberForm.new member
-    @active_members = Member.where.not(state: :removed).where.not(state: :declined).order('ticket ASC').decorate
   end
 
   def create
@@ -31,11 +30,11 @@ def create
     end
     @member_form = MemberForm.new member
     @member_form.submit params[:member]
+    User.find(member.id).update type: 'Member'
     if @member_form.save
-      User.find(member.id).update type: 'Member'
       redirect_to account_path
     else
-      @active_members = Member.where.not(state: :removed).where.not(state: :declined).order('ticket ASC').decorate
+      User.find(member.id).update type: nil
       render action: :new
     end
   end