Dmitriy Zaporozhets
b2d45bb544
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
...
Conflicts:
app/controllers/uploads_controller.rb
app/helpers/application_helper.rb
app/models/note.rb
app/services/test_hook_service.rb
db/schema.rb
spec/models/note_spec.rb
2015-05-13 14:10:14 +03:00
bugagazavr
acac788902
Added X-GitLab-Event header for web hooks
2015-05-08 16:49:03 +03:00
Douwe Maan
68ac20604b
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee
...
# Conflicts:
# app/controllers/groups/application_controller.rb
# app/services/test_hook_service.rb
# app/views/admin/groups/show.html.haml
# app/views/groups/_settings_nav.html.haml
# app/views/groups/show.html.haml
# app/views/layouts/_head.html.haml
# app/views/projects/_settings_nav.html.haml
# db/schema.rb
# features/project/project.feature
# features/steps/project/project.rb
2015-05-05 10:18:27 +02:00
Valery Sizov
bc9ba5237c
Revert "Added X-GitLab-Event header for web hooks"
...
This reverts commit 548f182814
2015-04-27 16:29:31 +03:00
Dmitriy Zaporozhets
2e243fc321
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
README.md
VERSION
app/controllers/projects/services_controller.rb
app/controllers/projects/uploads_controller.rb
app/services/test_hook_service.rb
db/schema.rb
features/steps/admin/settings.rb
lib/gitlab/reference_extractor.rb
spec/models/note_spec.rb
2015-04-27 11:53:31 +03:00
bugagazavr
548f182814
Added X-GitLab-Event header for web hooks
2015-04-25 21:31:52 +03:00
Dmitriy Zaporozhets
d01d0c02b7
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
app/controllers/admin/application_settings_controller.rb
app/controllers/groups/group_members_controller.rb
app/controllers/projects/deploy_keys_controller.rb
app/controllers/projects/project_members_controller.rb
app/models/concerns/mentionable.rb
app/models/project.rb
app/models/project_team.rb
app/models/service.rb
app/views/admin/application_settings/_form.html.haml
app/views/admin/groups/show.html.haml
app/views/groups/group_members/_new_group_member.html.haml
config/initializers/1_settings.rb
db/schema.rb
lib/gitlab/reference_extractor.rb
spec/lib/gitlab/reference_extractor_spec.rb
2015-04-15 19:22:57 +03:00
Douwe Maan
9e52a2dcab
Don't use URI.regexp to validate since it doens't have start/end anchors.
2015-04-11 11:38:14 +02:00
Valery Sizov
57875720ab
Group level webhooks
2015-03-12 20:46:10 +02:00
Dmitriy Zaporozhets
62ed1c537e
Explicitly define ordering in models using default_scope
2015-02-05 14:20:55 -08:00
Dmitriy Zaporozhets
a89d7adfa4
Rescue connection reset for web hooks
2015-02-03 13:57:28 -08:00
Dmitriy Zaporozhets
e890582681
Rubocop enabled for: Use spaces inside hash literal braces
2015-02-02 20:36:54 -08:00
Dmitriy Zaporozhets
b07802ab68
Rescue Net::OpenTimeout exception in web hook
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-29 16:41:10 +02:00
Dmitriy Zaporozhets
db2edff937
Handle web hook exception
...
Write to log if web hook cant be executed. This prevents 500 error when
test web hook with invalid URL and prevent exceptions and retries in
sidekiq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-04 15:07:01 +02:00
Kirill Zaitsev
b4963e9dda
Add tag_push_events to project hook api
2014-10-03 10:23:32 +04:00
Dmitriy Zaporozhets
38ed0deaac
Move hook models in separate dir
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-15 11:31:30 +03:00
Dmitriy Zaporozhets
bugagazavr
Douwe Maan
Valery Sizov