Fix bug in which a line count without empty lines was incorrectly used
Serve a file if in wiki.
Allow nested files in wiki.
Remove empty line.
Fix styling issues.
Add tests for wiki files showing.
A bit clearer naming for gollum_wiki.
Change gitlab:test task

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Use stub in testing.
Merge branch 'files_in_wiki' into 'master'

Add support to show files from wiki repository on wiki pages
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Add .pkgr.yml file for automated packaging on https://pkgr.io
Setup default gitlab.yml with possibility to override default url via environment variable.

This only applies to packaging with https://pkgr.io.
Merge pull request #6716 from pkgr/pkgr

Automatically generate debian package with pkgr.io
Merge pull request #6799 from Datacom/bug/parallel_diff_missing_lines_pr

Fix missing lines in Parallel Diff
Use production for Gitlab shell installation
Merge pull request #6927 from ahmedshafeeq/patch-1

Use production for Gitlab shell installation
WIP Testing
Implements the Language Statistics
Merge branch 'language_statistics' of https://github.com/erbunao/gitlabhq into language_statistics

* 'language_statistics' of https://github.com/erbunao/gitlabhq:
  WIP

Conflicts:
	app/controllers/projects/tree_controller.rb
	app/helpers/language_stats_helper.rb
	app/models/repository.rb
	app/views/projects/tree/_language_stats.html.haml
	app/views/projects/tree/_tree.html.haml