 Dmitriy Zaporozhets
|
935fc796d1
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
VERSION
app/controllers/admin/application_settings_controller.rb
app/controllers/omniauth_callbacks_controller.rb
app/controllers/projects/project_members_controller.rb
app/helpers/application_settings_helper.rb
app/models/user.rb
app/services/files/base_service.rb
app/views/profiles/accounts/show.html.haml
db/schema.rb
doc/install/installation.md
doc/update/6.x-or-7.x-to-7.11.md
doc/workflow/README.md
lib/gitlab/markdown/external_issue_reference_filter.rb
lib/gitlab/reference_extractor.rb
lib/gitlab/upgrader.rb
|
2015-06-05 11:40:36 +02:00 |
|
 Stan Hu
|
deeff56967
|
Add support for Webhook note events
Closes https://github.com/gitlabhq/gitlabhq/issues/6745
|
2015-05-21 23:48:16 -04:00 |
|
|
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 |
|
|
Valery Sizov
|
29e8d02ac4
|
Group level web hooks: tests
|
2015-03-12 20:46:10 +02:00 |
|
 Jeroen van Baarsen
|
0c4a70a306
|
Updated rspec to rspec 3.x syntax
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
|
2015-02-12 19:17:35 +01:00 |
|
 Robert Speicher
|
ab6f7164e0
|
Make the structure of spec/models match app/models
|
2015-01-30 15:51:10 -05:00 |
|