Fixed attachment identifier displaying underneath note text
Bumped the gitlab_git gem version
Added the contribution guide notice

This is shown at the creation of new issues and new merge requests, when
the repository has a contribution guide file.
Added Piwik support
Change Gitlab::Popen to use arrays for commands
Make the Gitlab::Popen path argument optional
Make it possible to call Gitlab::Popen.popen
Adapt use of Gitlab::Popen to new style
Fixed typo in comments of apllication.scss
Better redirect for edit blod from MergeRequest

If you cancel edit you will be redirected back to merge request
If you submit changes you will be redirected back to merge request

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

Better redirect for edit blobs from MergeRequest
 Merge branch 'gitlab_popen_array' into 'master'

Change Gitlab::Popen to only accept arrays as commands
Merge pull request #6420 from Seklfreak/add-piwik-support

Added Piwik Integration
Merge pull request #6382 from jvanbaarsen/contribution-guide-link

Contribution guide link
More entries to CHANGELOG

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Use gitlab_shell.path to invoke rewrite-hooks.sh

The backup restore code for repositories was assuming that gitlab-shell
is installed in /home/git/gitlab-shell. This commit changes that to use
the configuration setting from gitlab.yml that specifies the path where
gitlab-shell is installed.
Empty the database during Postgres backup restore

The expected behavior during a GitLab backup restore is to overwrite
existing database data. This works for MySQL because the output of
mysqldump contains 'DROP TABLE IF EXISTS' statements. pg_dump on the
other hand assumes that one will restore into an empty database. When
this is not the case, during the restore with psql some of the data will
be skipped if existing data is 'in the way'. By first invoking `rake
db:schema:load` during a Postgres GitLab backup restore, we make sure
that all important data is correctly restored.
Updated changelog with my name for #6267
Merge pull request #6423 from robertd/update_changelog

Updated changelog with my name for #6267
Merge pull request #6416 from robbytaylor/patch-1

Fixed typo in comments of apllication.scss