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.
Improve mobile UI for issues and merge requests
Add tests for wiki files showing.
A bit clearer naming for gollum_wiki.
Fixed misspelling 

Change one letter, change the world!
Change gitlab:test task

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'mobile_issues' into 'master'

Improve issue and MR mobile UI

Improve the mobile UI for issues and merge requests. To make use of Bootstrap's column grid this also slightly alters the current desktop UI. Namely, the state box is slightly wider and is a 2-column width rather than being a fixed width. This makes it so we can easily break the row into 2 lines on mobile.

### Current UI
[Mobile Current](https://www.dropbox.com/s/z3wai49rmo1hwoo/Screen%20Shot%202014-05-02%20at%205.32.45%20PM.png)

[Desktop Current](https://www.dropbox.com/s/pwbg9hm3dqft19p/Screen%20Shot%202014-05-02%20at%205.36.10%20PM.png)

### Proposed UI
[Mobile Proposed](https://www.dropbox.com/s/csb4xny28jlll0l/Screen%20Shot%202014-05-02%20at%205.28.35%20PM.png)

[Desktop Proposed](https://www.dropbox.com/s/pb64wzbh75jb9s4/Screen%20Shot%202014-05-02%20at%205.30.23%20PM.png)
Merge pull request #6925 from maiki/patch-1

Fixed misspelling
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