Conflicts:
	lib/gitlab/encode.rb

This helps fix cases where UTF-8 is wrongly identified as ISO-8859-1. We will only try to convert strings if we are 100% sure about the charset, otherwise, we will fallback to UTF-8.

It's dangerous to rescue errors here as it will hide bugs. define_tree_vars already catch all situations where something may not exist.

Updated; libreadline-dev > libreadline-gplv2-dev

;) Have fun!

Corrected line for running gl-system-install

fix merge_requests.html.haml

fix No route matches static.css Error

* Grit gem updated
* gitolite-client updated
* logger added
* few fixes

Refactoring: get rid of ruby antipattern unless/else and use if/else instead

Get rid of useless public/index.html (auto-generated file when new rails app was created)

Added force utf8 encoding

Use modified pygments.rb to allow dependency to rubypython 0.6

Use modified pygments.rb to allow dependency to rubypython 0.6.1 or above that fixes installation issues on some 64bit OSes like RHEL-based Scientific Linux 6.

Chosen 0.9.8 + Autocomplete contains

Bumped Chosen to 0.9.8 (latest) and added default option to allow autocompletes to find items containing entered text.

fix bug in mailer

Fix bug: Update Notify spec to use host set in config/gitlab.yml

Fixes failing tests introduced in pull request #824