fix build failure

(https://travis-ci.org/gitlabhq/gitlabhq/builds/3593153)
Show only ≤16 lines of code in a discussion (fix issue #2860).
A little bit of codestyle improvments
System hooks execution moved to System hook service
Method moved to service
Fix RESTfulness of project hook deletions by API
Removed unnecessary paramter hash. Also tidied up hash format in hook creation spec
Merge pull request #3053 from m4tthumphrey/api-delete-hook-by-id

Fix RESTfulness of project hook deletions by API
Migrations for convertion merge_status added
Database schema updated
State machine added for merge_status field
class.self methods moved to scopes
human_merge_status replaced by human_merge_status_name
We don't need to check .profile now that gitolite is replaced by gitlab-shell
Fix merge state detection
Update sidekiq
Update capybara, poltergeist, spinach, rspec-rails
Add LoginHelpers to feature type
move capybara scenarios to spec/features
improve selectors to pass capybara 2.0