delta/gitlab/gitlab-ce.git/spec/models/hooks, branch bump_gitlab_shell

Merge branch 'master' into rubocop-for-tests

2015-06-23T08:44:03+00:00

Signed-off-by: Dmitriy Zaporozhets 

Conflicts:
	spec/features/issues_spec.rb
	spec/models/forked_project_link_spec.rb
	spec/models/hooks/service_hook_spec.rb
	spec/models/hooks/web_hook_spec.rb
	spec/models/project_services/hipchat_service_spec.rb
	spec/requests/api/project_members_spec.rb
	spec/requests/api/projects_spec.rb
	spec/requests/api/system_hooks_spec.rb
	spec/services/archive_repository_service_spec.rb
	spec/support/matchers.rb
	spec/tasks/gitlab/backup_rake_spec.rb

Fix Style/Blocks cop violations

2015-06-22T20:00:54+00:00

Fix Style/SpaceInsideHashLiteralBraces cop violations

2015-06-22T18:41:00+00:00

These fixes were performed automatically by Rubocop's `-a` flag.

Fix `raise_error` without an argument deprecation warnings

2015-06-22T10:13:47+00:00

Add support for Webhook note events

2015-05-22T03:48:16+00:00

Closes https://github.com/gitlabhq/gitlabhq/issues/6745

Added X-GitLab-Event header for web hooks

2015-05-08T13:49:03+00:00

Revert "Added X-GitLab-Event header for web hooks"

2015-04-27T13:29:31+00:00

This reverts commit 548f182814acd0f7a110e6c165c186e345901b00.

Added X-GitLab-Event header for web hooks

2015-04-25T18:31:52+00:00

Updated rspec to rspec 3.x syntax

2015-02-12T18:17:35+00:00

Signed-off-by: Jeroen van Baarsen

Make the structure of spec/models match app/models

2015-01-30T20:51:10+00:00