Merge branch 'master' of https://github.com/cabeca/gitlab-ci into cabeca-master

Conflicts:
	app/models/build.rb

Gemfile

@@ -47,6 +47,9 @@ gem 'will_paginate', '~> 3.0'
 # State machine
 gem 'state_machine'
+# Encoding detection
+gem 'charlock_holmes'
+
 # Other
 gem 'rake'
 gem 'foreman'

app/models/build.rb

@@ -73,7 +73,8 @@ class Build < ActiveRecord::Base
   def write_trace(trace)
     self.reload
-    update_attributes(trace: trace)
+    sanitized_output = sanitize_build_output(trace)
+    update_attributes(trace: sanitized_output)
   end
   def short_before_sha
@@ -92,12 +93,24 @@ class Build < ActiveRecord::Base
     end
   end
+  def sanitize_build_output(output)
+    output.detect_encoding!.encode!('utf-8', invalid: :replace)
+  end
+
+  def read_tmp_file
+    if tmp_file && File.readable?(tmp_file)
+      File.read(tmp_file)
+    else
+      ''
+    end
+  end
   def compose_output
     output = trace
-    if running? && tmp_file && File.exists?(tmp_file)
-      output << File.read(tmp_file)
+    if running?
+      sanitized_output = sanitize_build_output(read_tmp_file)
+      output << sanitized_output
     end
     output

config/initializers/encoding_detection.rb

+require 'charlock_holmes/string'
\ No newline at end of file

doc/installation.md

@@ -10,7 +10,7 @@ Create a user for GitLab:
     sudo apt-get update
     sudo apt-get upgrade
-    sudo apt-get install -y wget curl gcc checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libreadline6-dev libc6-dev libssl-dev libmysql++-dev make build-essential zlib1g-dev openssh-server git-core libyaml-dev postfix libpq-dev
+    sudo apt-get install -y wget curl gcc checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libreadline6-dev libc6-dev libssl-dev libmysql++-dev make build-essential zlib1g-dev openssh-server git-core libyaml-dev postfix libpq-dev libicu-dev
     sudo apt-get install redis-server 
 ## 2. Install Ruby (RVM) for gitlab_ci