Don't email omniauth created users
fix: grouping by date desc doesn't sort it too
default gitlab.relative_url_root to ENV['RAILS_RELATIVE_URL_ROOT']
Fix image url for emoji.
Include Riyad Preukschas suggestions.
Update doc/install/databases.md

Remove prompt $ from code line for uniformity
Migrations added
User's blocked field refactored to use state machine
Typo fixed
Merge pull request #3143 from Undev/state-machine-3

State machine 3
Merge pull request #2954 from cabeca/fix-image-url-emoji

Fix image url for emoji.
Merge pull request #2015 from elvanja/commits-group-and-sort-by-date-desc

fix: grouping commits by date desc doesn't sort the groups too
Merge branch 'omniauth_no_email_1' of https://github.com/gliptak/gitlabhq into gliptak-omniauth_no_email_1

Conflicts:
	app/observers/user_observer.rb
	spec/observers/user_observer_spec.rb
fixed omniauth email spec
Merge branch 'gliptak-omniauth_no_email_1'
Merge pull request #3106 from davidosomething/patch-1

Update doc/install/databases.md
Merge pull request #2870 from mikew/relative-url-root-default

default gitlab.relative_url_root to ENV['RAILS_RELATIVE_URL_ROOT']
better solution for #3027
tree_heleper: concat html only if present. Avoid nil exception
reduce letter-spacing for top nav